From 510296f25ae53e5732fe98cdd4b68bfeea15204a Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 8 Aug 2014 22:51:40 +0300 Subject: [PATCH] modzlibd: Decompress part of "zlib" module, based on miniz tinfl.c . --- extmod/modzlibd.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ py/builtin.h | 1 + py/builtintables.c | 3 ++ py/mpconfig.h | 5 ++ py/py.mk | 3 +- py/qstrdefs.h | 5 ++ unix/mpconfigport.h | 1 + 7 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 extmod/modzlibd.c diff --git a/extmod/modzlibd.c b/extmod/modzlibd.c new file mode 100644 index 0000000000..2b9c9f5b2c --- /dev/null +++ b/extmod/modzlibd.c @@ -0,0 +1,108 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2014 Paul Sokolovsky + * + * 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. + */ + +#include +#include +#include +#include +#include +#include + +#include "mpconfig.h" +#include "misc.h" +#include "qstr.h" +#include "obj.h" +#include "runtime.h" + +#if MICROPY_PY_ZLIBD + +#include "miniz/tinfl.c" + +#if 0 // print debugging info +#define DEBUG_printf DEBUG_printf +#else // don't print debugging info +#define DEBUG_printf(...) (void)0 +#endif + +STATIC mp_obj_t mod_zlib_decompress(uint n_args, mp_obj_t *args) { + mp_obj_t data = args[0]; + mp_buffer_info_t bufinfo; + mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ); + tinfl_decompressor *decomp = m_new_obj(tinfl_decompressor); + tinfl_init(decomp); + DEBUG_printf("sizeof(tinfl_decompressor)=%d\n", sizeof(tinfl_decompressor)); + + byte *out = m_new(byte, bufinfo.len); + size_t out_len = bufinfo.len; + size_t in_buf_ofs = 0, dst_buf_ofs = 0; + size_t dst_buf_sz = bufinfo.len; + + while (1) { + size_t in_buf_sz = bufinfo.len - in_buf_ofs; + DEBUG_printf("tinfl in: in_ofs=%d in_sz=%d dst_ofs=%d, dst_sz=%d\n", in_buf_ofs, in_buf_sz, dst_buf_ofs, dst_buf_sz); + tinfl_status st = tinfl_decompress(decomp, + bufinfo.buf + in_buf_ofs, &in_buf_sz, + out, out + dst_buf_ofs, &dst_buf_sz, + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER); + DEBUG_printf("tinfl out: st=%d, in_sz=%d, out_sz=%d\n", st, in_buf_sz, dst_buf_sz); + in_buf_ofs += in_buf_sz; + dst_buf_ofs += dst_buf_sz; + if (st != TINFL_STATUS_HAS_MORE_OUTPUT) { + break; + } + out = m_renew(byte, out, out_len, dst_buf_ofs + 256); + out_len = dst_buf_ofs + 256; + dst_buf_sz = out_len - dst_buf_ofs; + } + + m_del_obj(tinfl_decompressor, decomp); + return mp_obj_new_bytearray_by_ref(dst_buf_ofs, out); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_zlib_decompress_obj, 1, 3, mod_zlib_decompress); + +STATIC const mp_map_elem_t mp_module_zlib_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_zlibd) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_decompress), (mp_obj_t)&mod_zlib_decompress_obj }, +}; + +STATIC const mp_obj_dict_t mp_module_zlib_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = MP_ARRAY_SIZE(mp_module_zlib_globals_table), + .alloc = MP_ARRAY_SIZE(mp_module_zlib_globals_table), + .table = (mp_map_elem_t*)mp_module_zlib_globals_table, + }, +}; + +const mp_obj_module_t mp_module_zlibd = { + .base = { &mp_type_module }, + .name = MP_QSTR_zlibd, + .globals = (mp_obj_dict_t*)&mp_module_zlib_globals, +}; + +#endif //MICROPY_PY_ZLIBD diff --git a/py/builtin.h b/py/builtin.h index 25edf32892..af428d0c04 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -89,3 +89,4 @@ extern struct _dummy_t mp_sys_stderr_obj; // extmod modules extern const mp_obj_module_t mp_module_uctypes; +extern const mp_obj_module_t mp_module_zlibd; diff --git a/py/builtintables.c b/py/builtintables.c index 0f0cfcbc72..e55e93b33a 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -196,6 +196,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = { #if MICROPY_PY_UCTYPES { MP_OBJ_NEW_QSTR(MP_QSTR_uctypes), (mp_obj_t)&mp_module_uctypes }, #endif +#if MICROPY_PY_ZLIBD + { MP_OBJ_NEW_QSTR(MP_QSTR_zlibd), (mp_obj_t)&mp_module_zlibd }, +#endif // extra builtin modules as defined by a port MICROPY_PORT_BUILTIN_MODULES diff --git a/py/mpconfig.h b/py/mpconfig.h index 351910b6dd..76e02be512 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -368,10 +368,15 @@ typedef double mp_float_t; // Extended modules + #ifndef MICROPY_PY_UCTYPES #define MICROPY_PY_UCTYPES (0) #endif +#ifndef MICROPY_PY_ZLIBD +#define MICROPY_PY_ZLIBD (0) +#endif + /*****************************************************************************/ /* Hooks for a port to add builtins */ diff --git a/py/py.mk b/py/py.mk index 5d62458812..08eeddc295 100644 --- a/py/py.mk +++ b/py/py.mk @@ -104,7 +104,8 @@ PY_O_BASENAME = \ smallint.o \ pfenv.o \ pfenv_printf.o \ - ../extmod/moductypes.o + ../extmod/moductypes.o \ + ../extmod/modzlibd.o \ # prepend the build destination prefix to the py object files PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 062f741de6..e154faf559 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -450,3 +450,8 @@ Q(getter) Q(setter) Q(deleter) #endif + +#if MICROPY_PY_ZLIBD +Q(zlibd) +Q(decompress) +#endif diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index ff30eec340..254a83a093 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -54,6 +54,7 @@ #define MICROPY_PY_GC_COLLECT_RETVAL (1) #define MICROPY_PY_UCTYPES (1) +#define MICROPY_PY_ZLIBD (1) // Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc. // names in exception messages (may require more RAM).