diff options
author | Jo-Philipp Wich <jo@mein.io> | 2022-01-15 21:22:37 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2022-01-18 11:21:20 +0100 |
commit | 371ba457917cf319b74de5a56e17782f6c4cd77a (patch) | |
tree | a5d5e14355c43849daa3236103817f0bb3025955 | |
parent | 6c2caf9fbb9d346cfb20cd5c83875fdff77e584c (diff) |
program: implement support for precompiling source files
- Introduce new command line flags `-o` and `-O` to write compiled program
code into the specified output file
- Add support for transparently executing precompiled files, the
lexical analyzing and com,pilation phase is skipped in this case
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r-- | compiler.c | 16 | ||||
-rw-r--r-- | include/ucode/program.h | 5 | ||||
-rw-r--r-- | include/ucode/source.h | 3 | ||||
-rw-r--r-- | include/ucode/util.h | 8 | ||||
-rw-r--r-- | main.c | 40 | ||||
-rw-r--r-- | program.c | 668 | ||||
-rw-r--r-- | source.c | 25 | ||||
-rw-r--r-- | tests/cram/test_basic.t | 2 |
8 files changed, 755 insertions, 12 deletions
@@ -2901,6 +2901,22 @@ uc_compile(uc_parse_config_t *config, uc_source_t *source, char **errp) break; + case UC_SOURCE_TYPE_PRECOMPILED: + prog = uc_program_from_file(source->fp, errp); + + if (prog) { + fn = uc_program_entry(prog); + + if (!fn) { + if (errp) + xasprintf(errp, "Program file contains no entry function\n"); + + uc_program_free(prog); + } + } + + break; + default: if (errp) xasprintf(errp, "Unrecognized source type\n"); diff --git a/include/ucode/program.h b/include/ucode/program.h index 0f56f99..9a5c553 100644 --- a/include/ucode/program.h +++ b/include/ucode/program.h @@ -31,4 +31,9 @@ uc_value_t *uc_program_function_load(uc_program_t *, size_t); uc_value_t *uc_program_get_constant(uc_program_t *, size_t); ssize_t uc_program_add_constant(uc_program_t *, uc_value_t *); +void uc_program_to_file(uc_program_t *, FILE *, bool); +uc_program_t *uc_program_from_file(FILE *file, char **); + +uc_function_t *uc_program_entry(uc_program_t *); + #endif /* __PROGRAM_H_ */ diff --git a/include/ucode/source.h b/include/ucode/source.h index e7a5667..ac0b487 100644 --- a/include/ucode/source.h +++ b/include/ucode/source.h @@ -25,8 +25,11 @@ #include "types.h" +#define UC_PRECOMPILED_BYTECODE_MAGIC 0x1b756362 /* <esc> 'u' 'c' 'b' */ + typedef enum { UC_SOURCE_TYPE_PLAIN = 0, + UC_SOURCE_TYPE_PRECOMPILED = 1, } uc_source_type_t; uc_source_t *uc_source_new_file(const char *path); diff --git a/include/ucode/util.h b/include/ucode/util.h index 858a3fd..1ad13bd 100644 --- a/include/ucode/util.h +++ b/include/ucode/util.h @@ -71,8 +71,8 @@ /* "failsafe" utility functions */ -static inline void *xalloc(size_t size) { - void *ptr = calloc(1, size); +static inline void *xcalloc(size_t size, size_t nmemb) { + void *ptr = calloc(size, nmemb); if (!ptr) { fprintf(stderr, "Out of memory\n"); @@ -82,6 +82,10 @@ static inline void *xalloc(size_t size) { return ptr; } +static inline void *xalloc(size_t size) { + return xcalloc(1, size); +} + static inline void *xrealloc(void *ptr, size_t size) { ptr = realloc(ptr, size); @@ -33,6 +33,7 @@ #include "ucode/lib.h" #include "ucode/vm.h" #include "ucode/source.h" +#include "ucode/program.h" static void @@ -52,7 +53,9 @@ print_usage(const char *app) " -e Set global variables from given JSON object\n" " -E Set global variables from given JSON file\n" " -x Disable given function\n" - " -m Preload given module\n", + " -m Preload given module\n" + " -o Write precompiled byte code to given file\n" + " -O Write precompiled byte code to given file and strip debug information\n", basename(app)); } @@ -75,7 +78,7 @@ register_variable(uc_value_t *scope, const char *key, uc_value_t *val) static int -compile(uc_vm_t *vm, uc_source_t *src) +compile(uc_vm_t *vm, uc_source_t *src, FILE *precompile, bool strip) { uc_value_t *res = NULL; uc_function_t *entry; @@ -91,6 +94,13 @@ compile(uc_vm_t *vm, uc_source_t *src) goto out; } + if (precompile) { + uc_program_to_file(entry->program, precompile, !strip); + uc_program_free(entry->program); + fclose(precompile); + goto out; + } + rc = uc_vm_execute(vm, entry, &res); switch (rc) { @@ -188,7 +198,9 @@ int main(int argc, char **argv) { uc_source_t *source = NULL, *envfile = NULL; + FILE *precompile = NULL; char *stdin = NULL, *c; + bool strip = false; uc_vm_t vm = { 0 }; uc_value_t *o, *p; int opt, rv = 0; @@ -219,7 +231,7 @@ main(int argc, char **argv) ucv_object_add(uc_vm_scope_get(&vm), "ARGV", o); /* parse options */ - while ((opt = getopt(argc, argv, "hlrtSRe:E:i:s:m:x:")) != -1) + while ((opt = getopt(argc, argv, "hlrtSRe:E:i:s:m:x:o:O:")) != -1) { switch (opt) { case 'h': @@ -354,6 +366,26 @@ main(int argc, char **argv) fprintf(stderr, "Unknown function %s specified\n", optarg); break; + + case 'o': + case 'O': + strip = (opt == 'O'); + + if (!strcmp(optarg, "-")) { + precompile = stdout; + } + else { + precompile = fopen(optarg, "wb"); + + if (!precompile) { + fprintf(stderr, "Unable to open output file %s: %s\n", + optarg, strerror(errno)); + + goto out; + } + } + + break; } } @@ -373,7 +405,7 @@ main(int argc, char **argv) goto out; } - rv = compile(&vm, source); + rv = compile(&vm, source, precompile, strip); out: uc_source_put(source); @@ -14,6 +14,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <assert.h> +#include <errno.h> +#include <endian.h> + #include "ucode/program.h" #include "ucode/source.h" #include "ucode/vallist.h" @@ -121,3 +125,667 @@ uc_program_add_constant(uc_program_t *prog, uc_value_t *val) { return uc_vallist_add(&prog->constants, val); } + +static void +write_u16(size_t value, FILE *file) +{ + uint16_t n; + + if (sizeof(value) > sizeof(n)) + assert(value <= UINT16_MAX); + + n = htobe16((uint16_t)value); + + fwrite(&n, 1, sizeof(n), file); +} + +static void +write_u32(size_t value, FILE *file) +{ + uint32_t n; + + if (sizeof(value) > sizeof(n)) + assert(value <= UINT32_MAX); + + n = htobe32((uint32_t)value); + + fwrite(&n, 1, sizeof(n), file); +} + +static void +write_u64(uint64_t value, FILE *file) +{ + uint64_t n; + + if (sizeof(value) > sizeof(n)) + assert(value <= UINT64_MAX); + + n = htobe64((uint64_t)value); + + fwrite(&n, 1, sizeof(n), file); +} + +static void +_write_vector(size_t count, size_t itemsize, void *data, FILE *file) +{ + size_t pad = (~(count * itemsize) + 1) & (sizeof(uint32_t) - 1); + char z[sizeof(uint32_t) - 1] = { 0 }; + + write_u32(count, file); + fwrite(data, itemsize, count, file); + fwrite(z, 1, pad, file); +} + +#define write_vector(vec, file) \ + _write_vector((vec)->count, sizeof((vec)->entries[0]), (vec)->entries, file) + +#define write_string(str, file) \ + _write_vector(strlen(str) + 1, 1, str, file) + +static void +write_vallist(uc_value_list_t *vallist, FILE *file) +{ + size_t i; + + /* write index */ + write_u32(vallist->isize, file); + + for (i = 0; i < vallist->isize; i++) + write_u64(vallist->index[i], file); + + /* write data */ + write_u32(vallist->dsize, file); + fwrite(vallist->data, 1, vallist->dsize, file); +} + +enum { + UC_PROGRAM_F_DEBUG = (1 << 0), + UC_PROGRAM_F_SOURCEINFO = (1 << 1), + UC_PROGRAM_F_SOURCEBUF = (1 << 2), +}; + +enum { + UC_FUNCTION_F_IS_ARROW = (1 << 0), + UC_FUNCTION_F_IS_VARARG = (1 << 1), + UC_FUNCTION_F_IS_STRICT = (1 << 2), + UC_FUNCTION_F_HAS_EXCEPTIONS = (1 << 3), + UC_FUNCTION_F_HAS_NAME = (1 << 4), + UC_FUNCTION_F_HAS_VARDBG = (1 << 5), + UC_FUNCTION_F_HAS_OFFSETDBG = (1 << 6), +}; + +static void +write_chunk(uc_chunk_t *chunk, FILE *file, uint32_t flags) +{ + size_t i; + + /* write bytecode data */ + write_vector(chunk, file); + + /* write exception ranges */ + if (flags & UC_FUNCTION_F_HAS_EXCEPTIONS) { + write_u32(chunk->ehranges.count, file); + + for (i = 0; i < chunk->ehranges.count; i++) { + write_u32(chunk->ehranges.entries[i].from, file); + write_u32(chunk->ehranges.entries[i].to, file); + write_u32(chunk->ehranges.entries[i].target, file); + write_u32(chunk->ehranges.entries[i].slot, file); + } + } + + /* write variable info */ + if (flags & UC_FUNCTION_F_HAS_VARDBG) { + write_u32(chunk->debuginfo.variables.count, file); + + for (i = 0; i < chunk->debuginfo.variables.count; i++) { + write_u32(chunk->debuginfo.variables.entries[i].from, file); + write_u32(chunk->debuginfo.variables.entries[i].to, file); + write_u32(chunk->debuginfo.variables.entries[i].slot, file); + write_u32(chunk->debuginfo.variables.entries[i].nameidx, file); + } + + write_vallist(&chunk->debuginfo.varnames, file); + } + + /* write offset info */ + if (flags & UC_FUNCTION_F_HAS_OFFSETDBG) + write_vector(&chunk->debuginfo.offsets, file); +} + +static void +write_function(uc_function_t *func, FILE *file, bool debug) +{ + uint32_t flags = 0; + + if (func->arrow) + flags |= UC_FUNCTION_F_IS_ARROW; + + if (func->vararg) + flags |= UC_FUNCTION_F_IS_VARARG; + + if (func->strict) + flags |= UC_FUNCTION_F_IS_STRICT; + + if (func->chunk.ehranges.count) + flags |= UC_FUNCTION_F_HAS_EXCEPTIONS; + + if (debug && func->name[0]) + flags |= UC_FUNCTION_F_HAS_NAME; + + if (debug && func->chunk.debuginfo.variables.count) + flags |= UC_FUNCTION_F_HAS_VARDBG; + + if (debug && func->chunk.debuginfo.offsets.count) + flags |= UC_FUNCTION_F_HAS_OFFSETDBG; + + write_u32(flags, file); + + if (flags & UC_FUNCTION_F_HAS_NAME) + write_string(func->name, file); + + write_u16(func->nargs, file); + write_u16(func->nupvals, file); + write_u32(func->srcpos, file); + + write_chunk(&func->chunk, file, flags); +} + +void +uc_program_to_file(uc_program_t *prog, FILE *file, bool debug) +{ + uint32_t flags = 0; + uc_weakref_t *ref; + size_t i; + + if (debug) + flags |= UC_PROGRAM_F_DEBUG; + + if (debug && prog->source) { + flags |= UC_PROGRAM_F_SOURCEINFO; + + if (prog->source->buffer) + flags |= UC_PROGRAM_F_SOURCEBUF; + } + + /* magic word + flags */ + write_u32(UC_PRECOMPILED_BYTECODE_MAGIC, file); + write_u32(flags, file); + + if (flags & UC_PROGRAM_F_SOURCEINFO) { + /* write source file name */ + write_string(prog->source->filename, file); + + /* include source buffer if program was compiled from stdin */ + if (flags & UC_PROGRAM_F_SOURCEBUF) + write_string(prog->source->buffer, file); + + /* write lineinfo data */ + write_vector(&prog->source->lineinfo, file); + } + + /* write constants */ + write_vallist(&prog->constants, file); + + /* write program sections */ + for (i = 0, ref = prog->functions.prev; ref != &prog->functions; ref = ref->prev) + i++; + + write_u32(i, file); + + for (ref = prog->functions.prev; ref != &prog->functions; ref = ref->prev) + write_function(ref_to_function(ref), file, debug); +} + +static bool +read_error(FILE *file, char **errp, const char *subject, size_t rlen, size_t len) +{ + const char *reason; + + if (feof(file)) + reason = "Premature EOF"; + else + reason = strerror(errno); + + if (errp) + xasprintf(errp, + "%s while reading %s at offset %ld, got %zu of %zu bytes\n", + reason, subject, ftell(file) - rlen, rlen, len); + + return false; +} + +static bool +skip_padding(FILE *file, size_t len, char **errp) +{ + size_t pad = (~len + 1) & (sizeof(uint32_t) - 1), rlen; + char buf[sizeof(uint32_t) - 1]; + + if (pad != 0) { + rlen = fread(buf, 1, pad, file); + + if (rlen != pad) + return read_error(file, errp, "padding", rlen, pad); + } + + return true; +} + +static bool +read_u32(FILE *file, uint32_t *n, const char *subj, char **errp) +{ + size_t rlen = fread(n, 1, sizeof(*n), file); + + if (rlen != sizeof(*n)) { + *n = 0; + + return read_error(file, errp, subj ? subj : "uint32_t", rlen, sizeof(*n)); + } + + *n = be32toh(*n); + + return true; +} + +static bool +read_u64(FILE *file, uint64_t *n, const char *subj, char **errp) +{ + size_t rlen = fread(n, 1, sizeof(*n), file); + + if (rlen != sizeof(*n)) { + *n = 0; + + return read_error(file, errp, subj ? subj : "uint64_t", rlen, sizeof(*n)); + } + + *n = be64toh(*n); + + return true; +} + +static bool +read_size_t(FILE *file, size_t *n, size_t size, const char *subj, char **errp) +{ + union { uint8_t u8; uint16_t u16; uint32_t u32; uint64_t u64; } nval; + size_t rlen; + + rlen = fread(&nval.u64, 1, size, file); + + if (rlen != size) { + *n = 0; + + if (!subj) { + switch (size) { + case 1: subj = "uint8_t"; break; + case 2: subj = "uint16_t"; break; + case 4: subj = "uint32_t"; break; + case 8: subj = "uint64_t"; break; + } + } + + return read_error(file, errp, subj, rlen, sizeof(nval)); + } + + switch (size) { + case 1: *n = (size_t) nval.u8; break; + case 2: *n = (size_t)be16toh(nval.u16); break; + case 4: *n = (size_t)be32toh(nval.u32); break; + case 8: *n = (size_t)be64toh(nval.u64); break; + } + + return true; +} + +static bool +_read_vector(FILE *file, void *ptr, size_t itemsize, const char *subj, char **errp) +{ + struct { size_t count; void *data; } *vec = ptr; + size_t rlen, len; + char subjbuf[64]; + + snprintf(subjbuf, sizeof(subjbuf), "%s vector size", subj); + + if (!read_size_t(file, &vec->count, sizeof(uint32_t), subjbuf, errp)) + return false; + + vec->data = xcalloc(vec->count, itemsize); + + len = vec->count; + rlen = fread(vec->data, itemsize, len, file); + + if (rlen != len) { + free(vec->data); + + vec->count = 0; + vec->data = NULL; + + snprintf(subjbuf, sizeof(subjbuf), "%s vector data", subj); + + return read_error(file, errp, subjbuf, rlen * itemsize, len * itemsize); + } + + return skip_padding(file, vec->count * itemsize, errp); +} + +#define read_vector(file, vec, subj, errp) \ + _read_vector(file, vec, sizeof((vec)->entries[0]), subj, errp) + +static bool +read_string(FILE *file, char *dst, size_t len, const char *subj, char **errp) +{ + size_t rlen; + + rlen = fread(dst, 1, len, file); + + if (rlen != len) + return read_error(file, errp, subj, rlen, len); + + return skip_padding(file, len, errp); +} + +static bool +read_vallist(FILE *file, uc_value_list_t *vallist, const char *subj, char **errp) +{ + char subjbuf[64]; + size_t i; + + /* read index */ + snprintf(subjbuf, sizeof(subjbuf), "%s index size", subj); + + if (!read_size_t(file, &vallist->isize, sizeof(uint32_t), subjbuf, errp)) + goto out; + + vallist->index = xcalloc(sizeof(vallist->index[0]), vallist->isize); + + for (i = 0; i < vallist->isize; i++) { + snprintf(subjbuf, sizeof(subjbuf), "%s index entry %zu of %zu", subj, i, vallist->isize); + + if (!read_u64(file, &vallist->index[i], subjbuf, errp)) + goto out; + } + + /* read data */ + snprintf(subjbuf, sizeof(subjbuf), "%s data size", subj); + + if (!read_size_t(file, &vallist->dsize, sizeof(uint32_t), subjbuf, errp)) + goto out; + + vallist->data = xalloc(vallist->dsize); + + snprintf(subjbuf, sizeof(subjbuf), "%s data", subj); + + if (!read_string(file, vallist->data, vallist->dsize, subj, errp)) + goto out; + + return true; + +out: + free(vallist->index); + free(vallist->data); + + vallist->isize = 0; + vallist->index = NULL; + + vallist->dsize = 0; + vallist->data = NULL; + + return false; +} + +static uc_source_t * +read_sourceinfo(FILE *file, uint32_t flags, char **errp) +{ + char *path = NULL, *code = NULL; + uc_source_t *source = NULL; + size_t len; + + if (flags & UC_PROGRAM_F_SOURCEINFO) { + if (!read_size_t(file, &len, sizeof(uint32_t), "sourceinfo filename length", errp)) + goto out; + + path = xalloc(len); + + if (!read_string(file, path, len, "sourceinfo filename", errp)) + goto out; + + if (flags & UC_PROGRAM_F_SOURCEBUF) { + if (!read_size_t(file, &len, sizeof(uint32_t), "sourceinfo code buffer length", errp)) + goto out; + + code = xalloc(len); + + if (!read_string(file, code, len, "sourceinfo code buffer data", errp)) + goto out; + + source = uc_source_new_buffer(path, code, len); + } + else { + source = uc_source_new_file(path); + + if (!source) { + fprintf(stderr, "Unable to open source file %s: %s\n", path, strerror(errno)); + source = uc_source_new_buffer(path, "", 0); + } + } + + if (!read_vector(file, &source->lineinfo, "sourceinfo lineinfo", errp)) { + uc_source_put(source); + source = NULL; + goto out; + } + } + else { + source = uc_source_new_buffer("[no source]", xstrdup(""), 0); + } + +out: + free(path); + free(code); + + return source; +} + +static bool +read_chunk(FILE *file, uc_chunk_t *chunk, uint32_t flags, const char *subj, char **errp) +{ + uc_varrange_t *varrange; + uc_ehrange_t *ehrange; + char subjbuf[192]; + size_t i; + + /* read bytecode data */ + snprintf(subjbuf, sizeof(subjbuf), "%s byte code", subj); + + if (!read_vector(file, chunk, subjbuf, errp)) + goto out; + + /* read exception ranges */ + if (flags & UC_FUNCTION_F_HAS_EXCEPTIONS) { + snprintf(subjbuf, sizeof(subjbuf), "%s exception ranges count", subj); + + if (!read_size_t(file, &chunk->ehranges.count, sizeof(uint32_t), subjbuf, errp)) + goto out; + + chunk->ehranges.entries = xcalloc( + sizeof(chunk->ehranges.entries[0]), + chunk->ehranges.count); + + for (i = 0; i < chunk->ehranges.count; i++) { + snprintf(subjbuf, sizeof(subjbuf), "%s exception range %zu of %zu offset", + subj, i, chunk->ehranges.count); + + ehrange = &chunk->ehranges.entries[i]; + + if (!read_size_t(file, &ehrange->from, sizeof(uint32_t), subjbuf, errp) || + !read_size_t(file, &ehrange->to, sizeof(uint32_t), subjbuf, errp) || + !read_size_t(file, &ehrange->target, sizeof(uint32_t), subjbuf, errp) || + !read_size_t(file, &ehrange->slot, sizeof(uint32_t), subjbuf, errp)) + goto out; + } + } + + /* read variable info */ + if (flags & UC_FUNCTION_F_HAS_VARDBG) { + snprintf(subjbuf, sizeof(subjbuf), "%s variable scopes count", subj); + + if (!read_size_t(file, &chunk->debuginfo.variables.count, sizeof(uint32_t), subjbuf, errp)) + goto out; + + chunk->debuginfo.variables.entries = xcalloc( + sizeof(chunk->debuginfo.variables.entries[0]), + chunk->debuginfo.variables.count); + + for (i = 0; i < chunk->debuginfo.variables.count; i++) { + snprintf(subjbuf, sizeof(subjbuf), "%s variable scope %zu of %zu offset", + subj, i, chunk->debuginfo.variables.count); + + varrange = &chunk->debuginfo.variables.entries[i]; + + if (!read_size_t(file, &varrange->from, sizeof(uint32_t), subjbuf, errp) || + !read_size_t(file, &varrange->to, sizeof(uint32_t), subjbuf, errp) || + !read_size_t(file, &varrange->slot, sizeof(uint32_t), subjbuf, errp) || + !read_size_t(file, &varrange->nameidx, sizeof(uint32_t), subjbuf, errp)) + goto out; + } + + snprintf(subjbuf, sizeof(subjbuf), "%s variable names", subj); + + if (!read_vallist(file, &chunk->debuginfo.varnames, subjbuf, errp)) + goto out; + } + + /* read offset info */ + if (flags & UC_FUNCTION_F_HAS_OFFSETDBG) { + snprintf(subjbuf, sizeof(subjbuf), "%s source offsets", subj); + + if (!read_vector(file, &chunk->debuginfo.offsets, subjbuf, errp)) + goto out; + } + + return true; + +out: + uc_vallist_free(&chunk->debuginfo.varnames); + + free(chunk->entries); + free(chunk->ehranges.entries); + free(chunk->debuginfo.variables.entries); + + chunk->count = 0; + chunk->entries = NULL; + + chunk->ehranges.count = 0; + chunk->ehranges.entries = NULL; + + chunk->debuginfo.variables.count = 0; + chunk->debuginfo.variables.entries = NULL; + + return false; +} + +static bool +read_function(FILE *file, uc_program_t *program, size_t idx, char **errp) +{ + char subjbuf[64], *name = NULL; + uc_function_t *func = NULL; + uint32_t flags, u32; + + snprintf(subjbuf, sizeof(subjbuf), "function #%zu flags", idx); + + if (!read_u32(file, &flags, subjbuf, errp)) + goto out; + + if (flags & UC_FUNCTION_F_HAS_NAME) { + snprintf(subjbuf, sizeof(subjbuf), "function #%zu name length", idx); + + if (!read_u32(file, &u32, subjbuf, errp)) + goto out; + + name = xalloc(u32); + + snprintf(subjbuf, sizeof(subjbuf), "function #%zu name", idx); + + if (!read_string(file, name, u32, subjbuf, errp)) + goto out; + } + + snprintf(subjbuf, sizeof(subjbuf), "function #%zu (%s) arg count and offset", idx, name ? name : "-"); + + func = (uc_function_t *)uc_program_function_new(program, name, 0); + func->arrow = (flags & UC_FUNCTION_F_IS_ARROW); + func->vararg = (flags & UC_FUNCTION_F_IS_VARARG); + func->strict = (flags & UC_FUNCTION_F_IS_STRICT); + + if (!read_size_t(file, &func->nargs, sizeof(uint16_t), subjbuf, errp) || + !read_size_t(file, &func->nupvals, sizeof(uint16_t), subjbuf, errp) || + !read_size_t(file, &func->srcpos, sizeof(uint32_t), subjbuf, errp)) + goto out; + + snprintf(subjbuf, sizeof(subjbuf), "function #%zu (%s) body", idx, name ? name : "-"); + + if (!read_chunk(file, &func->chunk, flags, subjbuf, errp)) + goto out; + + free(name); + + return true; + +out: + free(name); + + return false; +} + +uc_program_t * +uc_program_from_file(FILE *file, char **errp) +{ + uc_program_t *program = NULL; + uc_source_t *source = NULL; + uint32_t flags, nfuncs, i; + + if (!read_u32(file, &i, "file magic", errp)) + goto out; + + if (i != UC_PRECOMPILED_BYTECODE_MAGIC) { + xasprintf(errp, "Invalid file magic\n"); + goto out; + } + + if (!read_u32(file, &flags, "program flags", errp)) + goto out; + + source = read_sourceinfo(file, flags, errp); + + if (!source) + goto out; + + program = uc_program_new(source); + + uc_source_put(source); + + if (!read_vallist(file, &program->constants, "constants", errp)) + goto out; + + if (!read_u32(file, &nfuncs, "function count", errp)) + goto out; + + for (i = 0; i < nfuncs; i++) + if (!read_function(file, program, i, errp)) + goto out; + + return program; + +out: + uc_program_free(program); + + return NULL; +} + +uc_function_t * +uc_program_entry(uc_program_t *program) +{ + if (program->functions.prev == &program->functions) + return NULL; + + return ref_to_function(program->functions.prev); +} @@ -16,6 +16,7 @@ #include <string.h> #include <errno.h> +#include <endian.h> #include "ucode/source.h" @@ -124,7 +125,8 @@ uc_source_type_test(uc_source_t *source) union { char s[sizeof(uint32_t)]; uint32_t n; } buf; uc_source_type_t type = UC_SOURCE_TYPE_PLAIN; FILE *fp = source->fp; - int c; + size_t rlen; + int c = 0; if (fread(buf.s, 1, 2, fp) == 2 && !strncmp(buf.s, "#!", 2)) { source->off += 2; @@ -132,12 +134,8 @@ uc_source_type_test(uc_source_t *source) while ((c = fgetc(fp)) != EOF) { source->off++; - if (c == '\n') { - uc_source_line_update(source, source->off); - uc_source_line_next(source); - + if (c == '\n') break; - } } } else { @@ -145,6 +143,21 @@ uc_source_type_test(uc_source_t *source) fprintf(stderr, "Failed to rewind source buffer: %s\n", strerror(errno)); } + rlen = fread(buf.s, 1, 4, fp); + + if (rlen == 4 && buf.n == htobe32(UC_PRECOMPILED_BYTECODE_MAGIC)) { + type = UC_SOURCE_TYPE_PRECOMPILED; + } + else { + uc_source_line_update(source, source->off); + + if (c == '\n') + uc_source_line_next(source); + } + + if (fseek(fp, -(long)rlen, SEEK_CUR) == -1) + fprintf(stderr, "Failed to rewind source buffer: %s\n", strerror(errno)); + return type; } diff --git a/tests/cram/test_basic.t b/tests/cram/test_basic.t index 2c22131..d2a3605 100644 --- a/tests/cram/test_basic.t +++ b/tests/cram/test_basic.t @@ -25,6 +25,8 @@ check that ucode provides exepected help: -E Set global variables from given JSON file -x Disable given function -m Preload given module + -o Write precompiled byte code to given file + -O Write precompiled byte code to given file and strip debug information check that ucode prints greetings: |