From bd75100d2463900312377b4698d8b170540d002d Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sat, 5 May 2018 07:56:53 +0530 Subject: [PATCH] Adapt to use take-cheeze's marshal mrbgem --- binding-mruby/binding-mruby.cpp | 18 +- binding-mruby/mrb-ext/file-helper.cpp | 41 + binding-mruby/mrb-ext/file-helper.h | 6 + binding-mruby/mrb-ext/kernel.cpp | 30 +- binding-mruby/mrb-ext/marshal.cpp | 1028 ------------------------- binding-mruby/mrb-ext/marshal.h | 38 +- 6 files changed, 82 insertions(+), 1079 deletions(-) create mode 100644 binding-mruby/mrb-ext/file-helper.cpp create mode 100644 binding-mruby/mrb-ext/file-helper.h delete mode 100644 binding-mruby/mrb-ext/marshal.cpp diff --git a/binding-mruby/binding-mruby.cpp b/binding-mruby/binding-mruby.cpp index cc36141..ab5a44d 100644 --- a/binding-mruby/binding-mruby.cpp +++ b/binding-mruby/binding-mruby.cpp @@ -48,6 +48,7 @@ #include "binding-util.h" #include "binding-types.h" #include "mrb-ext/marshal.h" +#include "mrb-ext/file-helper.h" #ifdef __EMSCRIPTEN__ #include @@ -69,7 +70,6 @@ ScriptBinding *scriptBinding = &scriptBindingImpl; void fileBindingInit(mrb_state *); void timeBindingInit(mrb_state *); -void marshalBindingInit(mrb_state *); void kernelBindingInit(mrb_state *); void tableBindingInit(mrb_state *); @@ -96,7 +96,6 @@ static void mrbBindingInit(mrb_state *mrb) /* Init standard classes */ fileBindingInit(mrb); timeBindingInit(mrb); - marshalBindingInit(mrb); kernelBindingInit(mrb); /* Init RGSS classes */ @@ -263,12 +262,14 @@ static mrb_state * static_scriptmrb; void __attribute__ ((optnone)) main_update_loop() { mrb_load_nstring_cxt(static_mrb, "main_update_loop", 16, NULL); +#ifdef __EMSCRIPTEN__ if (static_mrb->exc) { printf("Execution Errored\n"); mrb_close(static_scriptmrb); shState->texPool().disable(); mrb_close(static_mrb); } +#endif } static void @@ -290,24 +291,23 @@ runRMXPScripts(mrb_state *mrb, mrbc_context *ctx) /* We use a secondary util state to unmarshal the scripts */ mrb_state *scriptMrb = mrb_open(); - SDL_RWops ops; - - shState->fileSystem().openReadRaw(ops, scriptPack.c_str()); mrb_value scriptArray = mrb_nil_value(); std::string readError; try { - scriptArray = marshalLoadInt(scriptMrb, &ops); + SDL_rw_file_helper fileHelper; + fileHelper.filename = scriptPack.c_str(); + char * contents = fileHelper.read(); + mrb_value rawdata = mrb_str_new_static(mrb, contents, fileHelper.length); + scriptArray = mrb_marshal_load(mrb, rawdata); } catch (const Exception &e) { readError = std::string(": ") + e.msg; } - SDL_RWclose(&ops); - if (!mrb_array_p(scriptArray)) { showError(std::string("Failed to read script data") + readError); @@ -389,7 +389,7 @@ runRMXPScripts(mrb_state *mrb, mrbc_context *ctx) #else while (true) { main_update_loop(); - SDL_Delay(20); + SDL_Delay(3); if (static_mrb->exc) break; } diff --git a/binding-mruby/mrb-ext/file-helper.cpp b/binding-mruby/mrb-ext/file-helper.cpp new file mode 100644 index 0000000..ef25acf --- /dev/null +++ b/binding-mruby/mrb-ext/file-helper.cpp @@ -0,0 +1,41 @@ + +#include "file-helper.h" +#include + +char* SDL_rw_file_helper::read() { + SDL_RWops *rw = SDL_RWFromFile(filename, "rb"); + if (rw == NULL) return NULL; + + Sint64 res_size = SDL_RWsize(rw); + char* res = (char*)malloc(res_size + 1); + + Sint64 nb_read_total = 0, nb_read = 1; + char* buf = res; + while (nb_read_total < res_size && nb_read != 0) { + nb_read = SDL_RWread(rw, buf, 1, (res_size - nb_read_total)); + nb_read_total += nb_read; + buf += nb_read; + } + SDL_RWclose(rw); + if (nb_read_total != res_size) { + free(res); + return NULL; + } + + res[nb_read_total] = '\0'; + length = nb_read_total; + return res; +} + +bool SDL_rw_file_helper::write(char * data) { + SDL_RWops *rw = SDL_RWFromFile("hello.txt", "w"); + if(rw != NULL) { + size_t len = SDL_strlen(data); + if (SDL_RWwrite(rw, data, 1, len) != len) { + return false; + } else { + return true; + } + SDL_RWclose(rw); + } +} diff --git a/binding-mruby/mrb-ext/file-helper.h b/binding-mruby/mrb-ext/file-helper.h new file mode 100644 index 0000000..4d55dae --- /dev/null +++ b/binding-mruby/mrb-ext/file-helper.h @@ -0,0 +1,6 @@ +struct SDL_rw_file_helper { + const char * filename; + char * read(); + int length; + bool write(char * data); +}; \ No newline at end of file diff --git a/binding-mruby/mrb-ext/kernel.cpp b/binding-mruby/mrb-ext/kernel.cpp index e82b7fb..07cc4cf 100644 --- a/binding-mruby/mrb-ext/kernel.cpp +++ b/binding-mruby/mrb-ext/kernel.cpp @@ -30,6 +30,7 @@ #include "../binding-util.h" #include "marshal.h" +#include "file-helper.h" #include "sharedstate.h" #include "eventthread.h" #include "exception.h" @@ -171,19 +172,19 @@ MRB_FUNCTION(kernelLoadData) const char *filename; mrb_get_args(mrb, "z", &filename); - SDL_RWops ops; - GUARD_EXC( shState->fileSystem().openReadRaw(ops, filename); ) - mrb_value obj; - try { obj = marshalLoadInt(mrb, &ops); } + try { + SDL_rw_file_helper fileHelper; + fileHelper.filename = filename; + char * contents = fileHelper.read(); + mrb_value rawdata = mrb_str_new_static(mrb, contents, fileHelper.length); + obj = mrb_marshal_load(mrb, rawdata); + } catch (const Exception &e) { - SDL_RWclose(&ops); raiseMrbExc(mrb, e); } - SDL_RWclose(&ops); - return obj; } @@ -194,19 +195,18 @@ MRB_FUNCTION(kernelSaveData) mrb_get_args(mrb, "oz", &obj, &filename); - SDL_RWops *ops = SDL_RWFromFile(filename, "w"); - if (!ops) - mrb_raise(mrb, getMrbData(mrb)->exc[SDL], SDL_GetError()); - - try { marshalDumpInt(mrb, ops, obj); } + try { + mrb_value dumped = mrb_nil_value(); + mrb_marshal_dump(mrb, obj, dumped); + SDL_rw_file_helper fileHelper; + fileHelper.filename = filename; + fileHelper.write(RSTRING_PTR(dumped)); + } catch (const Exception &e) { - SDL_RWclose(ops); raiseMrbExc(mrb, e); } - SDL_RWclose(ops); - return mrb_nil_value(); } diff --git a/binding-mruby/mrb-ext/marshal.cpp b/binding-mruby/mrb-ext/marshal.cpp deleted file mode 100644 index d6a5558..0000000 --- a/binding-mruby/mrb-ext/marshal.cpp +++ /dev/null @@ -1,1028 +0,0 @@ -/* -** marshal.cpp -** -** This file is part of mkxp. -** -** Copyright (C) 2013 Jonas Kulla -** -** mkxp is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** mkxp is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with mkxp. If not, see . -*/ - -#include "marshal.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "../binding-util.h" -#include "file.h" -#include "rwmem.h" -#include "exception.h" -#include "boost-hash.h" -#include "debugwriter.h" - -#include - - -#define MARSHAL_MAJOR 4 -#define MARSHAL_MINOR 8 - -#define TYPE_NIL '0' -#define TYPE_TRUE 'T' -#define TYPE_FALSE 'F' -#define TYPE_FIXNUM 'i' - -#define TYPE_OBJECT 'o' -//#define TYPE_DATA 'd' -#define TYPE_USERDEF 'u' -#define TYPE_USRMARSHAL 'U' -#define TYPE_FLOAT 'f' -//#define TYPE_BIGNUM 'l' -#define TYPE_STRING '"' -//#define TYPE_REGEXP '/' -#define TYPE_ARRAY '[' -#define TYPE_HASH '{' -#define TYPE_HASH_DEF '}' -#define TYPE_MODULE_OLD 'M' -#define TYPE_IVAR 'I' -#define TYPE_LINK '@' - -#define TYPE_SYMBOL ':' -#define TYPE_SYMLINK ';' - -// FIXME make these dynamically allocatd, per MarshalContext -static char gpbuffer[512]; - -inline size_t hash_value(mrb_value key) -{ - return boost::hash_value(key.value.p); -} - -inline bool operator==(mrb_value v1, mrb_value v2) -{ - if (mrb_type(v1) != mrb_type(v2)) - return false; - - switch (mrb_type(v1)) - { - case MRB_TT_TRUE: - return true; - - case MRB_TT_FALSE: - case MRB_TT_FIXNUM: - return (v1.value.i == v2.value.i); - case MRB_TT_SYMBOL: - return (v1.value.sym == v2.value.sym); - - case MRB_TT_FLOAT: - return (mrb_float(v1) == mrb_float(v2)); - - default: - return (mrb_ptr(v1) == mrb_ptr(v2)); - } -} - -template -struct LinkBuffer -{ - /* Key: val, Value: idx in vec */ - BoostHash hash; - std::vector vec; - - bool contains(T value) - { - return hash.contains(value); - } - - bool containsIdx(size_t idx) - { - if (vec.empty()) - return false; - - return (idx < vec.size()); - } - - int add(T value) - { - int idx = vec.size(); - - hash.insert(value, idx); - vec.push_back(value); - - return idx; - } - - T lookup(size_t idx) - { - return vec[idx]; - } - - int lookupIdx(T value) - { - return hash[value]; - } -}; - -struct MarshalContext -{ - SDL_RWops *ops; - mrb_state *mrb; - mrb_int limit; - - /* For Symlinks/Links */ - LinkBuffer symbols; - LinkBuffer objects; - - int8_t readByte() - { - int8_t byte; - int result = SDL_RWread(ops, &byte, 1, 1); - - if (result < 1) - throw Exception(Exception::ArgumentError, "dump format error"); - - return byte; - } - - void readData(char *dest, int len) - { - int result = SDL_RWread(ops, dest, 1, len); - - if (result < len) - throw Exception(Exception::ArgumentError, "dump format error"); - } - - void writeByte(int8_t byte) - { - int result = SDL_RWwrite(ops, &byte, 1, 1); - - if (result < 1) // FIXME not sure what the correct error would be here - throw Exception(Exception::IOError, "dump writing error"); - } - - void writeData(const char *data, int len) - { - int result = SDL_RWwrite(ops, data, 1, len); - - if (result < len) // FIXME not sure what the correct error would be here - throw Exception(Exception::IOError, "dump writing error"); - } -}; - - -static int -read_fixnum(MarshalContext *ctx) -{ - int8_t head = ctx->readByte(); - - if (head == 0) - return 0; - else if (head > 5) - return head - 5; - else if (head < -4) - return head + 5; - - int8_t pos = (head > 0); - int8_t len = pos ? head : head * -1; - - int8_t n1, n2, n3, n4; - - if (pos) - n2 = n3 = n4 = 0; - else - n2 = n3 = n4 = 0xFF; - - n1 = ctx->readByte(); - if (len >= 2) - n2 = ctx->readByte(); - if (len >= 3) - n3 = ctx->readByte(); - if (len >= 4) - n4 = ctx->readByte(); - - int result = ((0xFF << 0x00) & (n1 << 0x00)) - | ((0xFF << 0x08) & (n2 << 0x08)) - | ((0xFF << 0x10) & (n3 << 0x10)) - | ((0xFF << 0x18) & (n4 << 0x18)); - -// if (!pos) -// result = -((result ^ 0xFFFFFFFF) + 1); - - return result; -} - -static float -read_float(MarshalContext *ctx) -{ - int len = read_fixnum(ctx); - - ctx->readData(gpbuffer, len); - gpbuffer[len] = '\0'; - - return strtof(gpbuffer, 0); -} - -static char * -read_string(MarshalContext *ctx) -{ - int len = read_fixnum(ctx); - - ctx->readData(gpbuffer, len); - gpbuffer[len] = '\0'; - - return gpbuffer; -} - -static mrb_value -read_string_value(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - int len = read_fixnum(ctx); - - mrb_value str = mrb_str_new(mrb, 0, len); - char *ptr = RSTR_PTR(RSTRING(str)); - - ctx->readData(ptr, len); - ptr[len] = '\0'; - - return str; -} - -static mrb_value read_value(MarshalContext *ctx); - -static mrb_value -read_array(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - int len = read_fixnum(ctx); - int i; - - mrb_value array = mrb_ary_new_capa(mrb, len); - - ctx->objects.add(array); - - for (i = 0; i < len; ++i) - { - mrb_value val = read_value(ctx); - mrb_ary_set(mrb, array, i, val); - } - - return array; -} - -static mrb_value -read_hash(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - int len = read_fixnum(ctx); - int i; - - mrb_value hash = mrb_hash_new_capa(mrb, len); - - ctx->objects.add(hash); - - for (i = 0; i < len; ++i) - { - mrb_value key = read_value(ctx); - mrb_value val = read_value(ctx); - - mrb_hash_set(mrb, hash, key, val); - } - - return hash; -} - -static mrb_sym -read_symbol(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - - mrb_sym symbol = mrb_intern_cstr(mrb, read_string(ctx)); - ctx->symbols.add(symbol); - - return symbol; -} - -static mrb_sym -read_symlink(MarshalContext *ctx) -{ - int idx = read_fixnum(ctx); - - if (!ctx->symbols.containsIdx(idx)) - throw Exception(Exception::ArgumentError, "bad symlink"); - - return ctx->symbols.lookup(idx); -} - -static mrb_value -read_link(MarshalContext *ctx) -{ - int idx = read_fixnum(ctx); - - if (!ctx->objects.containsIdx(idx)) - throw Exception(Exception::ArgumentError, "dump format error (unlinked)"); - - return ctx->objects.lookup(idx); -} - -mrb_value -read_instance_var(MarshalContext *ctx) -{ - mrb_value obj = read_value(ctx); - - int iv_count = read_fixnum(ctx); - int i; - - ctx->objects.add(obj); - - for (i = 0; i < iv_count; ++i) - { - mrb_value iv_name = read_value(ctx); - mrb_value iv_value = read_value(ctx); - (void)iv_name; - (void)iv_value; - - // Instance vars for String/Array not supported yet -// mrb_iv_set(mrb, obj, mrb_symbol(iv_name), iv_value); - } - - return obj; -} - -static struct RClass * -mrb_class_from_path(mrb_state *mrb, mrb_value path) -{ - char *path_s; - switch (path.tt) - { - case MRB_TT_SYMBOL : - path_s = (char*) mrb_sym2name(mrb, mrb_symbol(path)); - break; - case MRB_TT_STRING : - path_s = (char*) RSTRING_PTR(path); - break; - default: - throw Exception(Exception::ArgumentError, "dump format error for symbol"); - } - - /* If a symbol contains any colons, mrb_sym2name - * will return the string with "s around it - * (e.g. :Mod::Class => :"Mod::Class"), - * so we need to skip those. */ - if (path_s[0] == '\"') - path_s++; - - char *p, *pbgn; - mrb_value klass = mrb_obj_value(mrb->object_class); - - p = pbgn = path_s; - - while (*p && *p != '\"') - { - while (*p && *p != ':' && *p != '\"') p++; - - mrb_sym sym = mrb_intern(mrb, pbgn, p-pbgn); - klass = mrb_const_get(mrb, klass, sym); - - if (p[0] == ':') - { - if (p[1] != ':') - return 0; - p += 2; - pbgn = p; - } - } - - return (struct RClass*) mrb_obj_ptr(klass); -} - -static mrb_value -read_object(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - mrb_value class_path = read_value(ctx); - - struct RClass *klass = - mrb_class_from_path(mrb, class_path); - - mrb_value obj = mrb_obj_value(mrb_obj_alloc(mrb, MRB_TT_OBJECT, klass)); - - ctx->objects.add(obj); - - int iv_count = read_fixnum(ctx); - int i; - - for (i = 0; i < iv_count; ++i) - { - mrb_value iv_name = read_value(ctx); - mrb_value iv_value = read_value(ctx); - - mrb_obj_iv_set(mrb, mrb_obj_ptr(obj), - mrb_symbol(iv_name), iv_value); - } - - return obj; -} - -static mrb_value -read_userdef(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - mrb_value class_path = read_value(ctx); - - struct RClass *klass = - mrb_class_from_path(mrb, class_path); - - /* Should check here if klass implements '_load()' */ - if (!mrb_obj_respond_to(mrb, mrb_class(mrb, mrb_obj_value(klass)), mrb_intern_cstr(mrb, "_load"))) - throw Exception(Exception::TypeError, - "class %s needs to have method '_load'", - RSTRING_PTR(class_path)); - - mrb_value data = read_string_value(ctx); - mrb_value obj = mrb_funcall(mrb, mrb_obj_value(klass), "_load", 1, data); - - return obj; -} - -static int maxArena = 0; - -static mrb_value -read_value(MarshalContext *ctx) -{ - mrb_state *mrb = ctx->mrb; - int8_t type = ctx->readByte(); - mrb_value value; - if (mrb->gc.arena_idx > maxArena) - maxArena = mrb->gc.arena_idx; - - int arena = mrb_gc_arena_save(mrb); - - switch (type) - { - case TYPE_NIL : - value = mrb_nil_value(); - break; - - case TYPE_TRUE : - value = mrb_true_value(); - break; - - case TYPE_FALSE : - value = mrb_false_value(); - break; - - case TYPE_FIXNUM : - value = mrb_fixnum_value(read_fixnum(ctx)); - break; - - case TYPE_FLOAT : - value = mrb_float_value(mrb, read_float(ctx)); - ctx->objects.add(value); - break; - - case TYPE_STRING : - value = read_string_value(ctx); - ctx->objects.add(value); - break; - - case TYPE_ARRAY : - value = read_array(ctx); - break; - - case TYPE_HASH : - value = read_hash(ctx); - break; - - case TYPE_SYMBOL : - value = mrb_symbol_value(read_symbol(ctx)); - break; - - case TYPE_SYMLINK : - value = mrb_symbol_value(read_symlink(ctx)); - break; - - case TYPE_OBJECT : - value = read_object(ctx); - break; - - case TYPE_IVAR : - value = read_instance_var(ctx); - break; - - case TYPE_LINK : - value = read_link(ctx); - break; - - case TYPE_USERDEF : - value = read_userdef(ctx); - ctx->objects.add(value); - break; - - default : - throw Exception(Exception::MKXPError, "Marshal.load: unsupported value type '%c'", - (char) type); - } - - mrb_gc_arena_restore(mrb, arena); - - return value; -} - -static void -write_fixnum(MarshalContext *ctx, int value) -{ - if (value == 0) - { - ctx->writeByte(0); - return; - } - else if (value > 0 && value < 123) - { - ctx->writeByte((int8_t) value + 5); - return; - } - else if (value < 0 && value > -124) - { - ctx->writeByte((int8_t) value - 5); - return; - } - - int8_t len; - - if (value > 0) - { - /* Positive number */ - if (value <= 0x7F) - { - /* 1 byte wide */ - len = 1; - } - else if (value <= 0x7FFF) - { - /* 2 bytes wide */ - len = 2; - } - else if (value <= 0x7FFFFF) - { - /* 3 bytes wide */ - len = 3; - } - else - { - /* 4 bytes wide */ - len = 4; - } - } - else - { - /* Negative number */ - if (value >= (int)0x80) - { - /* 1 byte wide */ - len = -1; - } - else if (value >= (int)0x8000) - { - /* 2 bytes wide */ - len = -2; - } - else if (value <= (int)0x800000) - { - /* 3 bytes wide */ - len = -3; - } - else - { - /* 4 bytes wide */ - len = -4; - } - } - - /* Write length */ - ctx->writeByte(len); - - /* Write bytes */ - if (len >= 1 || len <= -1) - { - ctx->writeByte((value & 0x000000FF) >> 0x00); - } - if (len >= 2 || len <= -2) - { - ctx->writeByte((value & 0x0000FF00) >> 0x08); - } - if (len >= 3 || len <= -3) - { - ctx->writeByte((value & 0x00FF0000) >> 0x10); - } - if (len == 4 || len == -4) - { - ctx->writeByte((value & 0xFF000000) >> 0x18); - } -} - -static void -write_float(MarshalContext *ctx, float value) -{ - sprintf(gpbuffer, "%.16g", value); - - int len = strlen(gpbuffer); - write_fixnum(ctx, len); - ctx->writeData(gpbuffer, len); -} - -static void -write_string(MarshalContext *ctx, const char *string) -{ - int len = strlen(string); - - write_fixnum(ctx, len); - ctx->writeData(string, len); -} - -static void -write_string_value(MarshalContext *ctx, mrb_value string) -{ - int len = RSTRING_LEN(string); - const char *ptr = RSTRING_PTR(string); - - write_fixnum(ctx, len); - ctx->writeData(ptr, len); -} - -static void write_value(MarshalContext *, mrb_value); - -static void -write_array(MarshalContext *ctx, mrb_value array) -{ - mrb_state *mrb = ctx->mrb; - int len = RARRAY_LEN(array); - write_fixnum(ctx, len); - - int i; - for (i = 0; i < len; ++i) - { - mrb_value value = mrb_ary_entry(array, i); - write_value(ctx, value); - } -} - -static void -write_hash(MarshalContext *ctx, mrb_value hash) -{ - mrb_state *mrb = ctx->mrb; - int len = 0; - - kh_ht *h = mrb_hash_tbl(mrb, hash); - if (h) - len = kh_size(h); - - write_fixnum(ctx, len); - - for (khiter_t k = kh_begin(h); k != kh_end(h); ++k) - { - if (!kh_exist(h, k)) - continue; - - write_value(ctx, kh_key(h, k)); - write_value(ctx, kh_val(h, k).v); - } -} - -static void -write_symbol(MarshalContext *ctx, mrb_value symbol) -{ - mrb_state *mrb = ctx->mrb; - mrb_sym sym = mrb_symbol(symbol); - mrb_int len; - const char *p = mrb_sym2name_len(mrb, sym, &len); - - write_string(ctx, p); -} - -static void -write_object(MarshalContext *ctx, mrb_value object) -{ - mrb_state *mrb = ctx->mrb; - struct RObject *o = mrb_obj_ptr(object); - - mrb_value path = mrb_class_path(mrb, o->c); - write_value(ctx, mrb_str_intern(mrb, path)); - - mrb_value iv_ary = mrb_obj_instance_variables(mrb, object); - int iv_count = RARRAY_LEN(iv_ary); - write_fixnum(ctx, iv_count); - - int i; - for (i = 0; i < iv_count; ++i) - { - mrb_value iv_name = mrb_ary_entry(iv_ary, i); - mrb_value iv_value = mrb_obj_iv_get(mrb, o, mrb_symbol(iv_name)); - - write_value(ctx, iv_name); - write_value(ctx, iv_value); - } -} - -static void -write_userdef(MarshalContext *ctx, mrb_value object) -{ - mrb_state *mrb = ctx->mrb; - struct RObject *o = mrb_obj_ptr(object); - - mrb_value path = mrb_class_path(mrb, o->c); - write_value(ctx, mrb_str_intern(mrb, path)); - - mrb_value dump = mrb_funcall(mrb, object, "_dump", 0); - write_string_value(ctx, dump); -} - -static void -write_value(MarshalContext *ctx, mrb_value value) -{ - mrb_state *mrb = ctx->mrb; - - int arena = mrb_gc_arena_save(mrb); - - if (ctx->objects.contains(value)) - { - ctx->writeByte(TYPE_LINK); - write_fixnum(ctx, ctx->objects.lookupIdx(value)); - mrb_gc_arena_restore(mrb, arena); - return; - } - - switch (mrb_type(value)) - { - case MRB_TT_TRUE : - ctx->writeByte(TYPE_TRUE); - break; - - case MRB_TT_FALSE : - if (mrb_fixnum(value)) - ctx->writeByte(TYPE_FALSE); - else - ctx->writeByte(TYPE_NIL); - - break; - - case MRB_TT_FIXNUM : - ctx->writeByte(TYPE_FIXNUM); - write_fixnum(ctx, mrb_fixnum(value)); - - break; - - case MRB_TT_FLOAT : - ctx->writeByte(TYPE_FLOAT); - write_float(ctx, mrb_float(value)); - ctx->objects.add(value); - - break; - - case MRB_TT_STRING : - ctx->objects.add(value); - ctx->writeByte(TYPE_STRING); - write_string_value(ctx, value); - - break; - - case MRB_TT_ARRAY : - ctx->objects.add(value); - ctx->writeByte(TYPE_ARRAY); - write_array(ctx, value); - - break; - - case MRB_TT_HASH : - ctx->objects.add(value); - ctx->writeByte(TYPE_HASH); - write_hash(ctx, value); - - break; - - case MRB_TT_SYMBOL : - if (ctx->symbols.contains(mrb_symbol(value))) - { - ctx->writeByte(TYPE_SYMLINK); - write_fixnum(ctx, ctx->symbols.lookupIdx(mrb_symbol(value))); - ctx->symbols.add(mrb_symbol(value)); - } - else - { - ctx->writeByte(TYPE_SYMBOL); - write_symbol(ctx, value); - } - - break; - - /* Objects seem to have wrong tt */ - case MRB_TT_CLASS : - case MRB_TT_OBJECT : - ctx->objects.add(value); - - if (mrb_obj_respond_to(mrb, mrb_obj_ptr(value)->c, - mrb_intern_lit(mrb, "_dump"))) - { - ctx->writeByte(TYPE_USERDEF); - write_userdef(ctx, value); - } - else - { - ctx->writeByte(TYPE_OBJECT); - write_object(ctx, value); - } - - break; - - default : - printf("Warning! Could not write value type '%c'(%d)\n", // FIXME not sure if raise or just print error - mrb_type(value), mrb_type(value)); - fflush(stdout); - } - - mrb_gc_arena_restore(mrb, arena); -} - -static void -writeMarshalHeader(MarshalContext *ctx) -{ - ctx->writeByte(MARSHAL_MAJOR); - ctx->writeByte(MARSHAL_MINOR); -} - -static void -verifyMarshalHeader(MarshalContext *ctx) -{ - int8_t maj = ctx->readByte(); - int8_t min = ctx->readByte(); - - if (maj != MARSHAL_MAJOR || min != MARSHAL_MINOR) - throw Exception(Exception::TypeError, "incompatible marshal file format (can't be read)"); -} - -MRB_FUNCTION(marshalDump) -{ - mrb_value val; - mrb_value port = mrb_nil_value(); - mrb_int limit = 100; - - mrb_get_args(mrb, "o|oi", &val, &port, &limit); - - SDL_RWops *ops; - - bool havePort = mrb_type(port) == MRB_TT_OBJECT; - bool dumpString = false; - mrb_value ret = port; - - if (havePort) - { - FileImpl *file = getPrivateDataCheck(mrb, port, FileType); - ops = file->ops; - } - else - { - ops = SDL_AllocRW(); - RWMemOpen(ops); - dumpString = true; - } - - try - { - MarshalContext ctx; - ctx.mrb = mrb; - ctx.limit = limit; - ctx.ops = ops; - - writeMarshalHeader(&ctx); - write_value(&ctx, val); - } - catch (const Exception &e) - { - if (dumpString) - { - SDL_RWclose(ops); - SDL_FreeRW(ops); - } - - raiseMrbExc(mrb, e); - } - - if (dumpString) - { - int dataSize = RWMemGetData(ops, 0); - - ret = mrb_str_new(mrb, 0, dataSize); - RWMemGetData(ops, RSTRING_PTR(ret)); - - SDL_RWclose(ops); - SDL_FreeRW(ops); - } - - return ret; -} - -MRB_FUNCTION(marshalLoad) -{ - mrb_value port; - - mrb_get_args(mrb, "o", &port); - - SDL_RWops *ops; - - bool freeOps = false; - - if (mrb_type(port) == MRB_TT_OBJECT) - { - FileImpl *file = getPrivateDataCheck(mrb, port, FileType); - ops = file->ops; - } - else if (mrb_string_p(port)) - { - ops = SDL_RWFromConstMem(RSTRING_PTR(port), RSTRING_LEN(port)); - freeOps = true; - } - else - { - Debug() << "FIXME: Marshal.load: generic IO port not implemented"; - return mrb_nil_value(); - } - - mrb_value val; - - try - { - MarshalContext ctx; - ctx.mrb = mrb; - ctx.ops = ops; - - verifyMarshalHeader(&ctx); - val = read_value(&ctx); - } - catch (const Exception &e) - { - if (freeOps) - SDL_RWclose(ops); - } - - if (freeOps) - SDL_RWclose(ops); - - return val; -} - -void -marshalBindingInit(mrb_state *mrb) -{ - RClass *module = mrb_define_module(mrb, "Marshal"); - - mrb_define_module_function(mrb, module, "dump", marshalDump, MRB_ARGS_REQ(1) | MRB_ARGS_OPT(2)); - mrb_define_module_function(mrb, module, "load", marshalLoad, MRB_ARGS_REQ(1)); -} - -/* Exceptions from these internal functions will be caught higher up */ -void -marshalDumpInt(mrb_state *mrb, SDL_RWops *ops, mrb_value val) -{ - MarshalContext ctx; - ctx.mrb = mrb; - ctx.ops = ops; - ctx.limit = 100; - - writeMarshalHeader(&ctx); - write_value(&ctx, val); -} - -mrb_value -marshalLoadInt(mrb_state *mrb, SDL_RWops *ops) -{ - MarshalContext ctx; - ctx.mrb = mrb; - ctx.ops = ops; - - verifyMarshalHeader(&ctx); - - mrb_value val = read_value(&ctx); - - return val; -} - diff --git a/binding-mruby/mrb-ext/marshal.h b/binding-mruby/mrb-ext/marshal.h index 71af495..b4f02cc 100644 --- a/binding-mruby/mrb-ext/marshal.h +++ b/binding-mruby/mrb-ext/marshal.h @@ -1,31 +1,15 @@ -/* -** marshal.h -** -** This file is part of mkxp. -** -** Copyright (C) 2013 Jonas Kulla -** -** mkxp is free software: you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation, either version 2 of the License, or -** (at your option) any later version. -** -** mkxp is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with mkxp. If not, see . -*/ +#ifndef MRUBY_MARSHAL_H +#define MRUBY_MARSHAL_H -#ifndef MARSHAL_H -#define MARSHAL_H +#if defined(__cplusplus) +extern "C" { +#endif -#include -#include +mrb_value mrb_marshal_dump(mrb_state* M, mrb_value v, mrb_value out); +mrb_value mrb_marshal_load(mrb_state* M, mrb_value str); -void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value); -mrb_value marshalLoadInt(mrb_state *, SDL_RWops *); +#if defined(__cplusplus) +} /* extern "C" { */ +#endif -#endif // MARSHAL_H +#endif /* MRUBY_ARRAY_H */