summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2015-10-31 17:48:18 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2015-10-31 17:51:57 +0000
commitc22706b9049c4c85205a8cc9a3dc72a4e4a52be5 (patch)
treef47a6325e859cbe4c83cf3dff42af85417e7c08a
parent3aacba15f821f8d7902473cff93bc506bad3b547 (diff)
downloadnetsurf-c22706b9049c4c85205a8cc9a3dc72a4e4a52be5.tar.gz
netsurf-c22706b9049c4c85205a8cc9a3dc72a4e4a52be5.tar.bz2
Update duktape to regexp-canonicalize-lookup branch.
- Add an optional 128kB lookup to optimize regexp canonicalization #411. https://github.com/svaarala/duktape/pull/411 This speeds up worst-case case-insensitive unicode regex handling.
-rw-r--r--javascript/duktape/duk_config.h164
-rw-r--r--javascript/duktape/duktape.c10605
-rw-r--r--javascript/duktape/duktape.h77
3 files changed, 8977 insertions, 1869 deletions
diff --git a/javascript/duktape/duk_config.h b/javascript/duktape/duk_config.h
index 2cdb49fd7..adf275432 100644
--- a/javascript/duktape/duk_config.h
+++ b/javascript/duktape/duk_config.h
@@ -170,6 +170,11 @@ static __inline__ unsigned long long duk_rdtsc(void) {
/* PowerPC */
#if defined(__powerpc) || defined(__powerpc__) || defined(__PPC__)
#define DUK_F_PPC
+#if defined(__PPC64__)
+#define DUK_F_PPC64
+#else
+#define DUK_F_PPC32
+#endif
#endif
/* Linux */
@@ -478,7 +483,9 @@ static __inline__ unsigned long long duk_rdtsc(void) {
* there is no platform specific date parsing/formatting but there is still
* the ISO 8601 standard format.
*/
+#if defined(DUK_COMPILING_DUKTAPE)
#include <windows.h>
+#endif
#include <limits.h>
#elif defined(DUK_F_FLASHPLAYER)
/* Crossbridge */
@@ -1082,6 +1089,11 @@ typedef duk_int_t duk_idx_t;
#define DUK_IDX_MIN DUK_INT_MIN
#define DUK_IDX_MAX DUK_INT_MAX
+/* Unsigned index variant. */
+typedef duk_uint_t duk_uidx_t;
+#define DUK_UIDX_MIN DUK_UINT_MIN
+#define DUK_UIDX_MAX DUK_UINT_MAX
+
/* Array index values, could be exact 32 bits.
* Currently no need for signed duk_arridx_t.
*/
@@ -1495,8 +1507,8 @@ typedef struct duk_hthread duk_context;
#define DUK_USE_PACKED_TVAL_POSSIBLE
#endif
-/* PPC: packed always possible */
-#if !defined(DUK_USE_PACKED_TVAL_POSSIBLE) && defined(DUK_F_PPC)
+/* PPC32: packed always possible */
+#if !defined(DUK_USE_PACKED_TVAL_POSSIBLE) && defined(DUK_F_PPC32)
#define DUK_USE_PACKED_TVAL_POSSIBLE
#endif
@@ -2018,6 +2030,18 @@ typedef FILE duk_file;
#define DUK_ALWAYS_INLINE /*nop*/
#endif
+/* Temporary workaround for GH-323: avoid inlining control when
+ * compiling from multiple sources, as it causes compiler trouble.
+ */
+#if !defined(DUK_SINGLE_FILE)
+#undef DUK_NOINLINE
+#undef DUK_INLINE
+#undef DUK_ALWAYS_INLINE
+#define DUK_NOINLINE /*nop*/
+#define DUK_INLINE /*nop*/
+#define DUK_ALWAYS_INLINE /*nop*/
+#endif
+
/*
* Symbol visibility macros
*
@@ -2228,6 +2252,16 @@ typedef FILE duk_file;
#endif
/*
+ * Target info string
+ */
+
+#if defined(DUK_OPT_TARGET_INFO)
+#define DUK_USE_TARGET_INFO DUK_OPT_TARGET_INFO
+#else
+#define DUK_USE_TARGET_INFO "unknown"
+#endif
+
+/*
* Long control transfer, setjmp/longjmp or alternatives
*
* Signal mask is not saved (when that can be communicated to the platform)
@@ -2264,16 +2298,6 @@ typedef FILE duk_file;
#endif
/*
- * Target info string
- */
-
-#if defined(DUK_OPT_TARGET_INFO)
-#define DUK_USE_TARGET_INFO DUK_OPT_TARGET_INFO
-#else
-#define DUK_USE_TARGET_INFO "unknown"
-#endif
-
-/*
* Speed/size and other performance options
*/
@@ -2294,11 +2318,17 @@ typedef FILE duk_file;
* where a speed-size tradeoff exists (e.g. lookup tables). When it really
* matters, specific use flags may be appropriate.
*/
-#define DUK_USE_PREFER_SIZE
+#undef DUK_USE_PREFER_SIZE
/* Use a sliding window for lexer; slightly larger footprint, slightly faster. */
#define DUK_USE_LEXER_SLIDING_WINDOW
+/* Transparent JSON.stringify() fastpath. */
+#undef DUK_USE_JSON_STRINGIFY_FASTPATH
+#if defined(DUK_OPT_JSON_STRINGIFY_FASTPATH)
+#define DUK_USE_JSON_STRINGIFY_FASTPATH
+#endif
+
/*
* Tagged type representation (duk_tval)
*/
@@ -2447,6 +2477,16 @@ typedef FILE duk_file;
#define DUK_USE_DEBUGGER_DUMPHEAP
#endif
+#define DUK_USE_DEBUGGER_THROW_NOTIFY
+#if defined(DUK_OPT_NO_DEBUGGER_THROW_NOTIFY)
+#undef DUK_USE_DEBUGGER_THROW_NOTIFY
+#endif
+
+#undef DUK_USE_DEBUGGER_PAUSE_UNCAUGHT
+#if defined(DUK_OPT_DEBUGGER_PAUSE_UNCAUGHT)
+#define DUK_USE_DEBUGGER_PAUSE_UNCAUGHT
+#endif
+
/* Debugger transport read/write torture. */
#undef DUK_USE_DEBUGGER_TRANSPORT_TORTURE
#if defined(DUK_OPT_DEBUGGER_TRANSPORT_TORTURE)
@@ -2681,6 +2721,12 @@ typedef FILE duk_file;
#undef DUK_USE_NONSTD_ARRAY_WRITE
#endif
+/* Node.js Buffer and Khronos/ES6 typed array support. */
+#define DUK_USE_BUFFEROBJECT_SUPPORT
+#if defined(DUK_OPT_NO_BUFFEROBJECT_SUPPORT)
+#undef DUK_USE_BUFFEROBJECT_SUPPORT
+#endif
+
/*
* Optional C API options
*/
@@ -2704,20 +2750,6 @@ typedef FILE duk_file;
#endif
/*
- * Deep vs. shallow stack.
- *
- * Some embedded platforms have very shallow stack (e.g. 64kB); default to
- * a shallow stack on unknown platforms or known embedded platforms.
- */
-
-#if defined(DUK_F_LINUX) || defined(DUK_F_BSD) || defined(DUK_F_WINDOWS) || \
- defined(DUK_F_APPLE) || defined(DUK_OPT_DEEP_C_STACK)
-#define DUK_USE_DEEP_C_STACK
-#else
-#undef DUK_USE_DEEP_C_STACK
-#endif
-
-/*
* Ecmascript compiler
*/
@@ -2930,10 +2962,6 @@ typedef FILE duk_file;
#define DUK_USE_PROVIDE_DEFAULT_ALLOC_FUNCTIONS
#undef DUK_USE_EXPLICIT_NULL_INIT
-#if !defined(DUK_USE_PACKED_TVAL)
-#define DUK_USE_EXPLICIT_NULL_INIT
-#endif
-
#define DUK_USE_ZERO_BUFFER_DATA
#if defined(DUK_OPT_NO_ZERO_BUFFER_DATA)
#undef DUK_USE_ZERO_BUFFER_DATA
@@ -2988,6 +3016,42 @@ typedef FILE duk_file;
#endif
/*
+ * User declarations
+ */
+
+#if defined(DUK_OPT_DECLARE)
+#define DUK_USE_USER_DECLARE() DUK_OPT_DECLARE
+#else
+#define DUK_USE_USER_DECLARE() /* no user declarations */
+#endif
+
+/*
+ * Autogenerated defaults
+ */
+
+#define DUK_USE_COMPILER_RECLIMIT 2500
+#undef DUK_USE_DATE_FORMAT_STRING
+#undef DUK_USE_DATE_GET_LOCAL_TZOFFSET
+#undef DUK_USE_DATE_GET_NOW
+#undef DUK_USE_DATE_PARSE_STRING
+#undef DUK_USE_DATE_PRS_GETDATE
+#undef DUK_USE_EXEC_FUN_LOCAL
+#undef DUK_USE_INTEGER_ME
+#undef DUK_USE_INTERRUPT_DEBUG_FIXUP
+#define DUK_USE_JSON_DECNUMBER_FASTPATH
+#define DUK_USE_JSON_DECSTRING_FASTPATH
+#define DUK_USE_JSON_DEC_RECLIMIT 1000
+#define DUK_USE_JSON_EATWHITE_FASTPATH
+#define DUK_USE_JSON_ENC_RECLIMIT 1000
+#define DUK_USE_JSON_QUOTESTRING_FASTPATH
+#undef DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE
+#define DUK_USE_MARK_AND_SWEEP_RECLIMIT 256
+#define DUK_USE_NATIVE_CALL_RECLIMIT 1000
+#undef DUK_USE_REFZERO_FINALIZER_TORTURE
+#define DUK_USE_REGEXP_COMPILER_RECLIMIT 10000
+#define DUK_USE_REGEXP_EXECUTOR_RECLIMIT 10000
+
+/*
* Alternative customization header
*
* If you want to modify the final DUK_USE_xxx flags directly (without
@@ -3000,6 +3064,14 @@ typedef FILE duk_file;
#endif
/*
+ * You may add overriding #define/#undef directives below for
+ * customization. You of course cannot un-#include or un-typedef
+ * anything; these require direct changes above.
+ */
+
+/* __OVERRIDE_DEFINES__ */
+
+/*
* Date provider selection
*
* User may define DUK_USE_DATE_GET_NOW() etc directly, in which case we'll
@@ -3061,36 +3133,6 @@ DUK_INTERNAL_DECL duk_bool_t duk_bi_date_format_parts_strftime(duk_context *ctx,
#endif /* DUK_COMPILING_DUKTAPE */
/*
- * User declarations
- */
-
-#if defined(DUK_OPT_DECLARE)
-#define DUK_USE_USER_DECLARE() DUK_OPT_DECLARE
-#else
-#define DUK_USE_USER_DECLARE() /* no user declarations */
-#endif
-
-/*
- * Autogenerated defaults
- */
-
-#undef DUK_USE_DATE_PRS_GETDATE
-#undef DUK_USE_INTEGER_ME
-#define DUK_USE_JSON_DECNUMBER_FASTPATH
-#define DUK_USE_JSON_DECSTRING_FASTPATH
-#define DUK_USE_JSON_EATWHITE_FASTPATH
-#define DUK_USE_JSON_QUOTESTRING_FASTPATH
-#undef DUK_USE_JSON_STRINGIFY_FASTPATH
-
-/*
- * You may add overriding #define/#undef directives below for
- * customization. You of course cannot un-#include or un-typedef
- * anything; these require direct changes above.
- */
-
-/* __OVERRIDE_DEFINES__ */
-
-/*
* Sanity check for the final effective internal defines. Also
* double checks user tweaks made by an optional duk_custom.h header.
*/
diff --git a/javascript/duktape/duktape.c b/javascript/duktape/duktape.c
index 5ee88adf6..3629388a3 100644
--- a/javascript/duktape/duktape.c
+++ b/javascript/duktape/duktape.c
@@ -1,6 +1,8 @@
/*
- * Single file autogenerated distributable for Duktape 1.2.99.
- * Git commit 2a41d0a38eef5edfe8691cf09427b6ee8a3ad5c9 (v1.2.0-310-g2a41d0a).
+ * Single source autogenerated distributable for Duktape 1.3.99.
+
+ * Git commit 40453939c5a5aa16898d19bbac4d02f77196cc8b (v1.3.0-138-g4045393).
+ * Git branch regexp-canonicalize-lookup.
*
* See Duktape AUTHORS.rst and LICENSE.txt for copyright and
* licensing information.
@@ -53,8 +55,9 @@
* Please include an e-mail address, a link to your GitHub profile, or something
* similar to allow your contribution to be identified accurately.
*
-* The following people have contributed code and agreed to irrevocably license
-* their contributions under the Duktape ``LICENSE.txt`` (in order of appearance):
+* The following people have contributed code, website contents, or Wiki contents,
+* and agreed to irrevocably license their contributions under the Duktape
+* ``LICENSE.txt`` (in order of appearance):
*
* * Sami Vaarala <sami.vaarala@iki.fi>
* * Niki Dobrev
@@ -62,6 +65,7 @@
* * L\u00e1szl\u00f3 Lang\u00f3 <llango.u-szeged@partner.samsung.com>
* * Legimet <legimet.calc@gmail.com>
* * Karl Skomski <karl@skomski.com>
+* * Bruce Pascoe <fatcerberus1@gmail.com>
*
* Other contributions
* ===================
@@ -225,6 +229,7 @@ struct duk_hbufferobject;
struct duk_hbuffer;
struct duk_hbuffer_fixed;
struct duk_hbuffer_dynamic;
+struct duk_hbuffer_external;
struct duk_propaccessor;
union duk_propvalue;
@@ -275,6 +280,7 @@ typedef struct duk_hthread duk_hthread;
typedef struct duk_hbuffer duk_hbuffer;
typedef struct duk_hbuffer_fixed duk_hbuffer_fixed;
typedef struct duk_hbuffer_dynamic duk_hbuffer_dynamic;
+typedef struct duk_hbuffer_external duk_hbuffer_external;
typedef struct duk_propaccessor duk_propaccessor;
typedef union duk_propvalue duk_propvalue;
@@ -1581,13 +1587,13 @@ DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[2624];
DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[147];
DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[1952];
#ifdef DUK_USE_BUILTIN_INITJS
-DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[187];
+DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[1757];
#endif /* DUK_USE_BUILTIN_INITJS */
#endif /* !DUK_SINGLE_FILE */
#define DUK_BUILTINS_DATA_LENGTH 1952
#ifdef DUK_USE_BUILTIN_INITJS
-#define DUK_BUILTIN_INITJS_DATA_LENGTH 187
+#define DUK_BUILTIN_INITJS_DATA_LENGTH 1757
#endif /* DUK_USE_BUILTIN_INITJS */
#define DUK_BIDX_GLOBAL 0
@@ -2926,13 +2932,13 @@ DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[2624];
DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[147];
DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[1952];
#ifdef DUK_USE_BUILTIN_INITJS
-DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[187];
+DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[1757];
#endif /* DUK_USE_BUILTIN_INITJS */
#endif /* !DUK_SINGLE_FILE */
#define DUK_BUILTINS_DATA_LENGTH 1952
#ifdef DUK_USE_BUILTIN_INITJS
-#define DUK_BUILTIN_INITJS_DATA_LENGTH 187
+#define DUK_BUILTIN_INITJS_DATA_LENGTH 1757
#endif /* DUK_USE_BUILTIN_INITJS */
#define DUK_BIDX_GLOBAL 0
@@ -4271,13 +4277,13 @@ DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[2624];
DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[147];
DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[1952];
#ifdef DUK_USE_BUILTIN_INITJS
-DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[187];
+DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[1757];
#endif /* DUK_USE_BUILTIN_INITJS */
#endif /* !DUK_SINGLE_FILE */
#define DUK_BUILTINS_DATA_LENGTH 1952
#ifdef DUK_USE_BUILTIN_INITJS
-#define DUK_BUILTIN_INITJS_DATA_LENGTH 187
+#define DUK_BUILTIN_INITJS_DATA_LENGTH 1757
#endif /* DUK_USE_BUILTIN_INITJS */
#define DUK_BIDX_GLOBAL 0
@@ -4869,12 +4875,12 @@ DUK_INTERNAL_DECL duk_uint8_t *duk_bw_insert_ensure_area(duk_hthread *thr, duk_b
DUK_INTERNAL_DECL void duk_bw_remove_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t off, duk_size_t len);
/* No duk_bw_remove_ensure_slice(), functionality would be identical. */
-DUK_ALWAYS_INLINE DUK_INTERNAL_DECL duk_uint16_t duk_raw_read_u16_be(duk_uint8_t **p);
-DUK_ALWAYS_INLINE DUK_INTERNAL_DECL duk_uint32_t duk_raw_read_u32_be(duk_uint8_t **p);
-DUK_ALWAYS_INLINE DUK_INTERNAL_DECL duk_double_t duk_raw_read_double_be(duk_uint8_t **p);
-DUK_ALWAYS_INLINE DUK_INTERNAL_DECL void duk_raw_write_u16_be(duk_uint8_t **p, duk_uint16_t val);
-DUK_ALWAYS_INLINE DUK_INTERNAL_DECL void duk_raw_write_u32_be(duk_uint8_t **p, duk_uint32_t val);
-DUK_ALWAYS_INLINE DUK_INTERNAL_DECL void duk_raw_write_double_be(duk_uint8_t **p, duk_double_t val);
+DUK_INTERNAL_DECL duk_uint16_t duk_raw_read_u16_be(duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_uint32_t duk_raw_read_u32_be(duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_double_t duk_raw_read_double_be(duk_uint8_t **p);
+DUK_INTERNAL_DECL void duk_raw_write_u16_be(duk_uint8_t **p, duk_uint16_t val);
+DUK_INTERNAL_DECL void duk_raw_write_u32_be(duk_uint8_t **p, duk_uint32_t val);
+DUK_INTERNAL_DECL void duk_raw_write_double_be(duk_uint8_t **p, duk_double_t val);
#if defined(DUK_USE_DEBUGGER_SUPPORT) /* For now only needed by the debugger. */
DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
@@ -4948,7 +4954,7 @@ DUK_INTERNAL_DECL const char *duk_str_not_configurable;
#define DUK_STR_SPRINTF_TOO_LONG duk_str_sprintf_too_long
#define DUK_STR_ALLOC_FAILED duk_str_alloc_failed
#define DUK_STR_POP_TOO_MANY duk_str_pop_too_many
-#define DUK_STR_BUFFER_NOT_DYNAMIC duk_str_buffer_not_dynamic
+#define DUK_STR_WRONG_BUFFER_TYPE duk_str_wrong_buffer_type
#define DUK_STR_FAILED_TO_EXTEND_VALSTACK duk_str_failed_to_extend_valstack
#define DUK_STR_ENCODE_FAILED duk_str_encode_failed
#define DUK_STR_DECODE_FAILED duk_str_decode_failed
@@ -4982,7 +4988,7 @@ DUK_INTERNAL_DECL const char *duk_str_buffer_too_long;
DUK_INTERNAL_DECL const char *duk_str_sprintf_too_long;
DUK_INTERNAL_DECL const char *duk_str_alloc_failed;
DUK_INTERNAL_DECL const char *duk_str_pop_too_many;
-DUK_INTERNAL_DECL const char *duk_str_buffer_not_dynamic;
+DUK_INTERNAL_DECL const char *duk_str_wrong_buffer_type;
DUK_INTERNAL_DECL const char *duk_str_failed_to_extend_valstack;
DUK_INTERNAL_DECL const char *duk_str_encode_failed;
DUK_INTERNAL_DECL const char *duk_str_decode_failed;
@@ -5344,11 +5350,6 @@ typedef duk_uint32_t duk_instr_t;
#define DUK_EXTRAOP_LABEL 32
#define DUK_EXTRAOP_ENDLABEL 33
-/* DUK_OP_EXTRA for debugging */
-#define DUK_EXTRAOP_DUMPREG 128
-#define DUK_EXTRAOP_DUMPREGS 129
-#define DUK_EXTRAOP_LOGMARK 130
-
/* DUK_OP_CALL flags in A */
#define DUK_BC_CALL_FLAG_TAILCALL (1 << 0)
#define DUK_BC_CALL_FLAG_EVALCALL (1 << 1)
@@ -5360,8 +5361,7 @@ typedef duk_uint32_t duk_instr_t;
#define DUK_BC_TRYCATCH_FLAG_WITH_BINDING (1 << 3)
/* DUK_OP_RETURN flags in A */
-#define DUK_BC_RETURN_FLAG_FAST (1 << 0)
-#define DUK_BC_RETURN_FLAG_HAVE_RETVAL (1 << 1)
+#define DUK_BC_RETURN_FLAG_HAVE_RETVAL (1 << 0)
/* DUK_OP_DECLVAR flags in A; bottom bits are reserved for propdesc flags (DUK_PROPDESC_FLAG_XXX) */
#define DUK_BC_DECLVAR_FLAG_UNDEF_VALUE (1 << 4) /* use 'undefined' for value automatically */
@@ -5818,11 +5818,6 @@ DUK_INTERNAL_DECL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_
#define DUK_JS_COMPILER_H_INCLUDED
/* ecmascript compiler limits */
-#if defined(DUK_USE_DEEP_C_STACK)
-#define DUK_COMPILER_RECURSION_LIMIT 2500L
-#else
-#define DUK_COMPILER_RECURSION_LIMIT 50L
-#endif
#define DUK_COMPILER_TOKEN_LIMIT 100000000L /* 1e8: protects against deeply nested inner functions */
/* maximum loopcount for peephole optimization */
@@ -5992,7 +5987,7 @@ struct duk_compiler_func {
duk_bool_t is_setget; /* is a setter/getter */
duk_bool_t is_decl; /* is a function declaration (as opposed to function expression) */
duk_bool_t is_strict; /* function is strict */
- duk_bool_t is_notail; /* function must not be tailcalled */
+ duk_bool_t is_notail; /* function must not be tail called */
duk_bool_t in_directive_prologue; /* parsing in "directive prologue", recognize directives */
duk_bool_t in_scanning; /* parsing in "scanning" phase (first pass) */
duk_bool_t may_direct_eval; /* function may call direct eval */
@@ -6035,7 +6030,7 @@ struct duk_compiler_ctx {
* Prototypes
*/
-#define DUK_JS_COMPILE_FLAG_EVAL (1 << 0) /* source is eval code (not program) */
+#define DUK_JS_COMPILE_FLAG_EVAL (1 << 0) /* source is eval code (not global) */
#define DUK_JS_COMPILE_FLAG_STRICT (1 << 1) /* strict outer context */
#define DUK_JS_COMPILE_FLAG_FUNCEXPR (1 << 2) /* source is a function expression (used for Function constructor) */
@@ -6054,19 +6049,9 @@ DUK_INTERNAL_DECL void duk_js_compile(duk_hthread *thr, const duk_uint8_t *src_b
#define DUK_RE_MAX_ATOM_COPIES 1000
/* regexp compilation limits */
-#if defined(DUK_USE_DEEP_C_STACK)
-#define DUK_RE_COMPILE_RECURSION_LIMIT 10000
-#else
-#define DUK_RE_COMPILE_RECURSION_LIMIT 100
-#endif
#define DUK_RE_COMPILE_TOKEN_LIMIT 100000000L /* 1e8 */
/* regexp execution limits */
-#if defined(DUK_USE_DEEP_C_STACK)
-#define DUK_RE_EXECUTE_RECURSION_LIMIT 10000
-#else
-#define DUK_RE_EXECUTE_RECURSION_LIMIT 100
-#endif
#define DUK_RE_EXECUTE_STEPS_LIMIT 1000000000L /* 1e9 */
/* regexp opcodes */
@@ -6149,7 +6134,7 @@ DUK_INTERNAL_DECL void duk_regexp_match_force_global(duk_hthread *thr); /* hack
*
* Selecting the tagged type format involves many trade-offs (memory
* use, size and performance of generated code, portability, etc),
- * see doc/types.txt for a detailed discussion (especially of how the
+ * see doc/types.rst for a detailed discussion (especially of how the
* IEEE double format is used to pack tagged values).
*
* NB: because macro arguments are often expressions, macros should
@@ -6185,22 +6170,20 @@ typedef union duk_double_union duk_tval;
#if defined(DUK_USE_FASTINT)
#define DUK_TAG_FASTINT 0xfff1UL /* embed: integer value */
#endif
-#define DUK_TAG_UNDEFINED 0xfff2UL /* embed: 0 or 1 (normal or unused) */
-#define DUK_TAG_NULL 0xfff3UL /* embed: nothing */
-#define DUK_TAG_BOOLEAN 0xfff4UL /* embed: 0 or 1 (false or true) */
+#define DUK_TAG_UNUSED 0xfff2UL /* marker; not actual tagged value */
+#define DUK_TAG_UNDEFINED 0xfff3UL /* embed: nothing */
+#define DUK_TAG_NULL 0xfff4UL /* embed: nothing */
+#define DUK_TAG_BOOLEAN 0xfff5UL /* embed: 0 or 1 (false or true) */
/* DUK_TAG_NUMBER would logically go here, but it has multiple 'tags' */
-#define DUK_TAG_POINTER 0xfff5UL /* embed: void ptr */
-#define DUK_TAG_LIGHTFUNC 0xfff6UL /* embed: func ptr */
-#define DUK_TAG_STRING 0xfff7UL /* embed: duk_hstring ptr */
-#define DUK_TAG_OBJECT 0xfff8UL /* embed: duk_hobject ptr */
-#define DUK_TAG_BUFFER 0xfff9UL /* embed: duk_hbuffer ptr */
+#define DUK_TAG_POINTER 0xfff6UL /* embed: void ptr */
+#define DUK_TAG_LIGHTFUNC 0xfff7UL /* embed: func ptr */
+#define DUK_TAG_STRING 0xfff8UL /* embed: duk_hstring ptr */
+#define DUK_TAG_OBJECT 0xfff9UL /* embed: duk_hobject ptr */
+#define DUK_TAG_BUFFER 0xfffaUL /* embed: duk_hbuffer ptr */
/* for convenience */
-#define DUK_XTAG_UNDEFINED_ACTUAL 0xfff20000UL
-#define DUK_XTAG_UNDEFINED_UNUSED 0xfff20001UL
-#define DUK_XTAG_NULL 0xfff30000UL
-#define DUK_XTAG_BOOLEAN_FALSE 0xfff40000UL
-#define DUK_XTAG_BOOLEAN_TRUE 0xfff40001UL
+#define DUK_XTAG_BOOLEAN_FALSE 0xfff50000UL
+#define DUK_XTAG_BOOLEAN_TRUE 0xfff50001UL
/* two casts to avoid gcc warning: "warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]" */
#ifdef DUK_USE_64BIT_OPS
@@ -6277,10 +6260,12 @@ typedef union duk_double_union duk_tval;
#define DUK__TVAL_GET_FASTINT_I32(v) ((duk_int32_t) (v)->ui[DUK_DBL_IDX_UI1])
#endif /* DUK_USE_FASTINT */
-#define DUK_TVAL_SET_UNDEFINED_ACTUAL(v) DUK_DBLUNION_SET_HIGH32((v), DUK_XTAG_UNDEFINED_ACTUAL)
-#define DUK_TVAL_SET_UNDEFINED_UNUSED(v) DUK_DBLUNION_SET_HIGH32((v), DUK_XTAG_UNDEFINED_UNUSED)
-
-/* Note: 16-bit initializer suffices (unlike for undefined/boolean) */
+#define DUK_TVAL_SET_UNDEFINED(v) do { \
+ (v)->us[DUK_DBL_IDX_US0] = (duk_uint16_t) DUK_TAG_UNDEFINED; \
+ } while (0)
+#define DUK_TVAL_SET_UNUSED(v) do { \
+ (v)->us[DUK_DBL_IDX_US0] = (duk_uint16_t) DUK_TAG_UNUSED; \
+ } while (0)
#define DUK_TVAL_SET_NULL(v) do { \
(v)->us[DUK_DBL_IDX_US0] = (duk_uint16_t) DUK_TAG_NULL; \
} while (0)
@@ -6291,12 +6276,17 @@ typedef union duk_double_union duk_tval;
/* Assumes that caller has normalized NaNs, otherwise trouble ahead. */
#if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_DOUBLE(v,d) DUK_DBLUNION_SET_DOUBLE((v), (d))
+#define DUK_TVAL_SET_DOUBLE(v,d) do { \
+ duk_double_t duk__dblval; \
+ duk__dblval = (d); \
+ DUK_ASSERT_DOUBLE_IS_NORMALIZED(duk__dblval); \
+ DUK_DBLUNION_SET_DOUBLE((v), duk__dblval); \
+ } while (0)
#define DUK_TVAL_SET_FASTINT(v,i) DUK__TVAL_SET_FASTINT((v), (i))
#define DUK_TVAL_SET_FASTINT_I32(v,i) DUK__TVAL_SET_FASTINT_I32((v), (i))
#define DUK_TVAL_SET_FASTINT_U32(v,i) DUK__TVAL_SET_FASTINT_U32((v), (i))
#define DUK_TVAL_SET_NUMBER_CHKFAST(v,d) duk_tval_set_number_chkfast((v), (d))
-#define DUK_TVAL_SET_NUMBER(v,d) DUK_DBLUNION_SET_DOUBLE((v), (d))
+#define DUK_TVAL_SET_NUMBER(v,d) DUK_TVAL_SET_DOUBLE((v), (d))
#define DUK_TVAL_CHKFAST_INPLACE(v) do { \
duk_tval *duk__tv; \
duk_double_t duk__d; \
@@ -6307,9 +6297,14 @@ typedef union duk_double_union duk_tval;
} \
} while (0)
#else
-#define DUK_TVAL_SET_NUMBER(v,d) DUK_DBLUNION_SET_DOUBLE((v), (d))
-#define DUK_TVAL_SET_NUMBER_CHKFAST(v,d) DUK_TVAL_SET_NUMBER((v), (d))
-#define DUK_TVAL_SET_DOUBLE(v,d) DUK_TVAL_SET_NUMBER((v), (d))
+#define DUK_TVAL_SET_DOUBLE(v,d) do { \
+ duk_double_t duk__dblval; \
+ duk__dblval = (d); \
+ DUK_ASSERT_DOUBLE_IS_NORMALIZED(duk__dblval); \
+ DUK_DBLUNION_SET_DOUBLE((v), duk__dblval); \
+ } while (0)
+#define DUK_TVAL_SET_NUMBER_CHKFAST(v,d) DUK_TVAL_SET_DOUBLE((v), (d))
+#define DUK_TVAL_SET_NUMBER(v,d) DUK_TVAL_SET_DOUBLE((v), (d))
#define DUK_TVAL_CHKFAST_INPLACE(v) do { } while (0)
#endif
@@ -6349,8 +6344,7 @@ typedef union duk_double_union duk_tval;
#define DUK_TVAL_GET_TAG(v) ((duk_small_uint_t) (v)->us[DUK_DBL_IDX_US0])
#define DUK_TVAL_IS_UNDEFINED(v) (DUK_TVAL_GET_TAG((v)) == DUK_TAG_UNDEFINED)
-#define DUK_TVAL_IS_UNDEFINED_ACTUAL(v) ((v)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_UNDEFINED_ACTUAL)
-#define DUK_TVAL_IS_UNDEFINED_UNUSED(v) ((v)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_UNDEFINED_UNUSED)
+#define DUK_TVAL_IS_UNUSED(v) (DUK_TVAL_GET_TAG((v)) == DUK_TAG_UNUSED)
#define DUK_TVAL_IS_NULL(v) (DUK_TVAL_GET_TAG((v)) == DUK_TAG_NULL)
#define DUK_TVAL_IS_BOOLEAN(v) (DUK_TVAL_GET_TAG((v)) == DUK_TAG_BOOLEAN)
#define DUK_TVAL_IS_BOOLEAN_TRUE(v) ((v)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_BOOLEAN_TRUE)
@@ -6370,6 +6364,7 @@ typedef union duk_double_union duk_tval;
#define DUK_TVAL_IS_DOUBLE(v) DUK_TVAL_IS_NUMBER((v))
#endif
+/* This is performance critical because it appears in every DECREF. */
#define DUK_TVAL_IS_HEAP_ALLOCATED(v) (DUK_TVAL_GET_TAG((v)) >= DUK_TAG_STRING)
#if defined(DUK_USE_FASTINT)
@@ -6423,9 +6418,10 @@ struct duk_tval_struct {
#define DUK_TAG_BOOLEAN 4
#define DUK_TAG_POINTER 5
#define DUK_TAG_LIGHTFUNC 6
-#define DUK_TAG_STRING 7
-#define DUK_TAG_OBJECT 8
-#define DUK_TAG_BUFFER 9
+#define DUK_TAG_UNUSED 7 /* marker; not actual tagged type */
+#define DUK_TAG_STRING 8 /* first heap allocated, match bit boundary */
+#define DUK_TAG_OBJECT 9
+#define DUK_TAG_BUFFER 10
/* DUK__TAG_NUMBER is intentionally first, as it is the default clause in code
* to support the 8-byte representation. Further, it is a non-heap-allocated
@@ -6434,14 +6430,12 @@ struct duk_tval_struct {
*/
/* setters */
-#define DUK_TVAL_SET_UNDEFINED_ACTUAL(tv) do { \
+#define DUK_TVAL_SET_UNDEFINED(tv) do { \
(tv)->t = DUK_TAG_UNDEFINED; \
- (tv)->v.i = 0; \
} while (0)
-#define DUK_TVAL_SET_UNDEFINED_UNUSED(tv) do { \
- (tv)->t = DUK_TAG_UNDEFINED; \
- (tv)->v.i = 1; \
+#define DUK_TVAL_SET_UNUSED(tv) do { \
+ (tv)->t = DUK_TAG_UNUSED; \
} while (0)
#define DUK_TVAL_SET_NULL(tv) do { \
@@ -6488,7 +6482,7 @@ struct duk_tval_struct {
(tv)->t = DUK__TAG_NUMBER; \
(tv)->v.d = (val); \
} while (0)
-#define DUK_TVAL_SET_NUMBER_CHKFAST(v,d) \
+#define DUK_TVAL_SET_NUMBER_CHKFAST(tv,d) \
DUK_TVAL_SET_NUMBER((tv), (d))
#define DUK_TVAL_SET_DOUBLE(v,d) \
DUK_TVAL_SET_NUMBER((tv), (d))
@@ -6566,8 +6560,7 @@ struct duk_tval_struct {
/* decoding */
#define DUK_TVAL_GET_TAG(tv) ((tv)->t)
#define DUK_TVAL_IS_UNDEFINED(tv) ((tv)->t == DUK_TAG_UNDEFINED)
-#define DUK_TVAL_IS_UNDEFINED_ACTUAL(tv) (((tv)->t == DUK_TAG_UNDEFINED) && ((tv)->v.i == 0))
-#define DUK_TVAL_IS_UNDEFINED_UNUSED(tv) (((tv)->t == DUK_TAG_UNDEFINED) && ((tv)->v.i != 0))
+#define DUK_TVAL_IS_UNUSED(tv) ((tv)->t == DUK_TAG_UNUSED)
#define DUK_TVAL_IS_NULL(tv) ((tv)->t == DUK_TAG_NULL)
#define DUK_TVAL_IS_BOOLEAN(tv) ((tv)->t == DUK_TAG_BOOLEAN)
#define DUK_TVAL_IS_BOOLEAN_TRUE(tv) (((tv)->t == DUK_TAG_BOOLEAN) && ((tv)->v.i != 0))
@@ -6587,7 +6580,15 @@ struct duk_tval_struct {
#define DUK_TVAL_IS_OBJECT(tv) ((tv)->t == DUK_TAG_OBJECT)
#define DUK_TVAL_IS_BUFFER(tv) ((tv)->t == DUK_TAG_BUFFER)
+/* This is performance critical because it's needed for every DECREF.
+ * Take advantage of the fact that the first heap allocated tag is 8,
+ * so that bit 3 is set for all heap allocated tags (and never set for
+ * non-heap-allocated tags).
+ */
+#if 0
#define DUK_TVAL_IS_HEAP_ALLOCATED(tv) ((tv)->t >= DUK_TAG_STRING)
+#endif
+#define DUK_TVAL_IS_HEAP_ALLOCATED(tv) ((tv)->t & 0x08)
#if defined(DUK_USE_FASTINT)
#if 0
@@ -6987,6 +6988,250 @@ struct duk_heaphdr_string {
} \
} while (0)
+/*
+ * Macros to set a duk_tval and update refcount of the target (decref the
+ * old value and incref the new value if necessary). This is both performance
+ * and footprint critical; any changes made should be measured for size/speed.
+ */
+
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_UNDEFINED(tv__dst); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_UNUSED_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_UNUSED(tv__dst); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_NULL_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_NULL(tv__dst); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_BOOLEAN(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_NUMBER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_NUMBER(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_NUMBER_CHKFAST(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#define DUK_TVAL_SET_DOUBLE_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_DOUBLE(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#define DUK_TVAL_SET_NAN_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_NAN(tv__dst); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#if defined(DUK_USE_FASTINT)
+#define DUK_TVAL_SET_FASTINT_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_FASTINT(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#define DUK_TVAL_SET_FASTINT_I32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_FASTINT_I32(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#define DUK_TVAL_SET_FASTINT_U32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_FASTINT_U32(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+#endif /* DUK_USE_FASTINT */
+
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0(thr,tvptr_dst,lf_v,lf_fp,lf_flags) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_LIGHTFUNC(tv__dst, (lf_v), (lf_fp), (lf_flags)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_STRING_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_STRING(tv__dst, (newval)); \
+ DUK_HSTRING_INCREF((thr), (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_OBJECT_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_OBJECT(tv__dst, (newval)); \
+ DUK_HOBJECT_INCREF((thr), (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_BUFFER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_BUFFER(tv__dst, (newval)); \
+ DUK_HBUFFER_INCREF((thr), (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#define DUK_TVAL_SET_POINTER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_POINTER(tv__dst, (newval)); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+/* DUK_TVAL_SET_TVAL_UPDREF() is used a lot in executor, property lookups,
+ * etc, so it's very important for performance.
+ *
+ * NOTE: the source and destination duk_tval pointers may be the same, and
+ * the macros MUST deal with that correctly.
+ */
+
+/* Original idiom used. */
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT0(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; duk_tval tv__tmp; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF((thr), tv__src); \
+ DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+#if 0 /* XXX: to optimize and measure */
+/* Original idiom but with forced fast refcount macros. */
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT0F(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; duk_tval tv__tmp; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF_FAST((thr), tv__src); \
+ DUK_TVAL_DECREF_FAST((thr), &tv__tmp); /* side effects */ \
+ } while (0)
+
+/* Use 'h__obj' temporary to avoid a full duk_tval copy. */
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT1(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; duk_heaphdr *h__obj; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ if (DUK_TVAL_IS_HEAP_ALLOCATED(tv__dst)) { \
+ h__obj = DUK_TVAL_GET_HEAPHDR(tv__dst); \
+ DUK_ASSERT(h__obj != NULL); \
+ } else { \
+ h__obj = NULL; \
+ } \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF((thr), tv__src); \
+ if (h__obj != NULL) { \
+ DUK_HEAPHDR_DECREF_FAST((thr), h__obj); /* side effects */ \
+ } \
+ } while (0)
+
+/* Use 'h__obj' temporary to avoid a full duk_tval copy. */
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT1A(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; duk_heaphdr *h__obj; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ if (DUK_UNLIKELY(DUK_TVAL_IS_HEAP_ALLOCATED(tv__dst))) { \
+ h__obj = DUK_TVAL_GET_HEAPHDR(tv__dst); \
+ DUK_ASSERT(h__obj != NULL); \
+ } else { \
+ h__obj = NULL; \
+ } \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF_FAST((thr), tv__src); \
+ if (DUK_UNLIKELY(h__obj != NULL)) { \
+ DUK_HEAPHDR_DECREF_FAST((thr), h__obj); /* side effects */ \
+ } \
+ } while (0)
+
+/* Avoid rechecking 'h__obj'. */
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT2(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; duk_heaphdr *h__obj; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ if (DUK_TVAL_IS_HEAP_ALLOCATED(tv__dst)) { \
+ h__obj = DUK_TVAL_GET_HEAPHDR(tv__dst); \
+ DUK_ASSERT(h__obj != NULL); \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF((thr), tv__src); \
+ DUK_HEAPHDR_DECREF_FAST((thr), h__obj); /* side effects */ \
+ } else { \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF((thr), tv__src); \
+ } \
+ } while (0)
+
+/* Avoid rechecking 'h__obj'. */
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT3(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; duk_heaphdr *h__obj; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ if (DUK_UNLIKELY(DUK_TVAL_IS_HEAP_ALLOCATED(tv__dst))) { \
+ h__obj = DUK_TVAL_GET_HEAPHDR(tv__dst); \
+ DUK_ASSERT(h__obj != NULL); \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF_FAST((thr), tv__src); \
+ DUK_HEAPHDR_DECREF_FAST((thr), h__obj); /* side effects */ \
+ } else { \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_TVAL_INCREF_FAST((thr), tv__src); \
+ } \
+ } while (0)
+#endif
+
+/* XXX: no optimized variants yet */
+#define DUK_TVAL_SET_UNDEFINED_UPDREF DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
+#define DUK_TVAL_SET_UNUSED_UPDREF DUK_TVAL_SET_UNUSED_UPDREF_ALT0
+#define DUK_TVAL_SET_NULL_UPDREF DUK_TVAL_SET_NULL_UPDREF_ALT0
+#define DUK_TVAL_SET_BOOLEAN_UPDREF DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_UPDREF DUK_TVAL_SET_NUMBER_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0
+#define DUK_TVAL_SET_DOUBLE_UPDREF DUK_TVAL_SET_DOUBLE_UPDREF_ALT0
+#define DUK_TVAL_SET_NAN_UPDREF DUK_TVAL_SET_NAN_UPDREF_ALT0
+#if defined(DUK_USE_FASTINT)
+#define DUK_TVAL_SET_FASTINT_UPDREF DUK_TVAL_SET_FASTINT_UPDREF_ALT0
+#define DUK_TVAL_SET_FASTINT_I32_UPDREF DUK_TVAL_SET_FASTINT_I32_UPDREF_ALT0
+#define DUK_TVAL_SET_FASTINT_U32_UPDREF DUK_TVAL_SET_FASTINT_U32_UPDREF_ALT0
+#endif /* DUK_USE_FASTINT */
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0
+#define DUK_TVAL_SET_STRING_UPDREF DUK_TVAL_SET_STRING_UPDREF_ALT0
+#define DUK_TVAL_SET_OBJECT_UPDREF DUK_TVAL_SET_OBJECT_UPDREF_ALT0
+#define DUK_TVAL_SET_BUFFER_UPDREF DUK_TVAL_SET_BUFFER_UPDREF_ALT0
+#define DUK_TVAL_SET_POINTER_UPDREF DUK_TVAL_SET_POINTER_UPDREF_ALT0
+
+#if defined(DUK_USE_FAST_REFCOUNT_DEFAULT)
+/* Optimized for speed. */
+#define DUK_TVAL_SET_TVAL_UPDREF DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_FAST DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_SLOW DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#else
+/* Optimized for size. */
+#define DUK_TVAL_SET_TVAL_UPDREF DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_FAST DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_SLOW DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#endif
+
#else /* DUK_USE_REFERENCE_COUNTING */
#define DUK_TVAL_INCREF_FAST(thr,v) do {} while (0) /* nop */
@@ -7018,6 +7263,128 @@ struct duk_heaphdr_string {
#define DUK_HOBJECT_INCREF_ALLOWNULL(thr,h) do {} while (0) /* nop */
#define DUK_HOBJECT_DECREF_ALLOWNULL(thr,h) do {} while (0) /* nop */
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_UNDEFINED(tv__dst); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_UNUSED_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_UNUSED(tv__dst); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_NULL_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_NULL(tv__dst); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_BOOLEAN(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_NUMBER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_NUMBER(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_NUMBER_CHKFAST(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#define DUK_TVAL_SET_DOUBLE_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_DOUBLE(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#define DUK_TVAL_SET_NAN_UPDREF_ALT0(thr,tvptr_dst) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_NAN(tv__dst); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#if defined(DUK_USE_FASTINT)
+#define DUK_TVAL_SET_FASTINT_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_FASTINT(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#define DUK_TVAL_SET_FASTINT_I32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_FASTINT_I32(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#define DUK_TVAL_SET_FASTINT_U32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_FASTINT_U32(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+#endif /* DUK_USE_FASTINT */
+
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0(thr,tvptr_dst,lf_v,lf_fp,lf_flags) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_LIGHTFUNC(tv__dst, (lf_v), (lf_fp), (lf_flags)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_STRING_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_STRING(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_OBJECT_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_OBJECT(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_BUFFER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_BUFFER(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_POINTER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
+ duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+ DUK_TVAL_SET_POINTER(tv__dst, (newval)); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT0(thr,tvptr_dst,tvptr_src) do { \
+ duk_tval *tv__dst, *tv__src; \
+ tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+ DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
+ DUK_UNREF((thr)); \
+ } while (0)
+
+#define DUK_TVAL_SET_UNDEFINED_UPDREF DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
+#define DUK_TVAL_SET_UNUSED_UPDREF DUK_TVAL_SET_UNUSED_UPDREF_ALT0
+#define DUK_TVAL_SET_NULL_UPDREF DUK_TVAL_SET_NULL_UPDREF_ALT0
+#define DUK_TVAL_SET_BOOLEAN_UPDREF DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_UPDREF DUK_TVAL_SET_NUMBER_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0
+#define DUK_TVAL_SET_DOUBLE_UPDREF DUK_TVAL_SET_DOUBLE_UPDREF_ALT0
+#define DUK_TVAL_SET_NAN_UPDREF DUK_TVAL_SET_NAN_UPDREF_ALT0
+#if defined(DUK_USE_FASTINT)
+#define DUK_TVAL_SET_FASTINT_UPDREF DUK_TVAL_SET_FASTINT_UPDREF_ALT0
+#define DUK_TVAL_SET_FASTINT_I32_UPDREF DUK_TVAL_SET_FASTINT_I32_UPDREF_ALT0
+#define DUK_TVAL_SET_FASTINT_U32_UPDREF DUK_TVAL_SET_FASTINT_U32_UPDREF_ALT0
+#endif /* DUK_USE_FASTINT */
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0
+#define DUK_TVAL_SET_STRING_UPDREF DUK_TVAL_SET_STRING_UPDREF_ALT0
+#define DUK_TVAL_SET_OBJECT_UPDREF DUK_TVAL_SET_OBJECT_UPDREF_ALT0
+#define DUK_TVAL_SET_BUFFER_UPDREF DUK_TVAL_SET_BUFFER_UPDREF_ALT0
+#define DUK_TVAL_SET_POINTER_UPDREF DUK_TVAL_SET_POINTER_UPDREF_ALT0
+
+#define DUK_TVAL_SET_TVAL_UPDREF DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_FAST DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_SLOW DUK_TVAL_SET_TVAL_UPDREF_ALT0
+
#endif /* DUK_USE_REFERENCE_COUNTING */
#endif /* DUK_HEAPHDR_H_INCLUDED */
@@ -7122,10 +7489,16 @@ DUK_INTERNAL_DECL void *duk_get_voidptr(duk_context *ctx, duk_idx_t index);
#endif
DUK_INTERNAL_DECL duk_hstring *duk_to_hstring(duk_context *ctx, duk_idx_t index);
+#if defined(DUK_USE_DEBUGGER_SUPPORT) /* only needed by debugger for now */
+DUK_INTERNAL_DECL duk_hstring *duk_safe_to_hstring(duk_context *ctx, duk_idx_t index);
+#endif
+
DUK_INTERNAL_DECL duk_int_t duk_to_int_clamped_raw(duk_context *ctx, duk_idx_t index, duk_int_t minval, duk_int_t maxval, duk_bool_t *out_clamped); /* out_clamped=NULL, RangeError if outside range */
DUK_INTERNAL_DECL duk_int_t duk_to_int_clamped(duk_context *ctx, duk_idx_t index, duk_int_t minval, duk_int_t maxval);
DUK_INTERNAL_DECL duk_int_t duk_to_int_check_range(duk_context *ctx, duk_idx_t index, duk_int_t minval, duk_int_t maxval);
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL_DECL duk_uint8_t duk_to_uint8clamped(duk_context *ctx, duk_idx_t index);
+#endif
DUK_INTERNAL_DECL duk_hstring *duk_require_hstring(duk_context *ctx, duk_idx_t index);
DUK_INTERNAL_DECL duk_hobject *duk_require_hobject(duk_context *ctx, duk_idx_t index);
@@ -7142,9 +7515,6 @@ DUK_INTERNAL_DECL duk_hnativefunction *duk_require_hnativefunction(duk_context *
DUK_INTERNAL_DECL duk_hobject *duk_require_hobject_or_lfunc(duk_context *ctx, duk_idx_t index);
DUK_INTERNAL_DECL duk_hobject *duk_require_hobject_or_lfunc_coerce(duk_context *ctx, duk_idx_t index);
-#if defined(DUK_USE_DEBUGGER_SUPPORT)
-DUK_INTERNAL_DECL void duk_push_unused(duk_context *ctx);
-#endif
DUK_INTERNAL_DECL void duk_push_hstring(duk_context *ctx, duk_hstring *h);
DUK_INTERNAL_DECL void duk_push_hstring_stridx(duk_context *ctx, duk_small_int_t stridx);
DUK_INTERNAL_DECL void duk_push_hobject(duk_context *ctx, duk_hobject *h);
@@ -7166,7 +7536,7 @@ DUK_INTERNAL_DECL void duk_push_c_function_noconstruct_noexotic(duk_context *ctx
DUK_INTERNAL_DECL void duk_push_string_funcptr(duk_context *ctx, duk_uint8_t *ptr, duk_size_t sz);
DUK_INTERNAL_DECL void duk_push_lightfunc_name(duk_context *ctx, duk_tval *tv);
DUK_INTERNAL_DECL void duk_push_lightfunc_tostring(duk_context *ctx, duk_tval *tv);
-DUK_INTERNAL_DECL duk_hbufferobject *duk_push_bufferobject(duk_context *ctx, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx);
+DUK_INTERNAL_DECL duk_hbufferobject *duk_push_bufferobject_raw(duk_context *ctx, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx);
DUK_INTERNAL_DECL duk_bool_t duk_get_prop_stridx(duk_context *ctx, duk_idx_t obj_index, duk_small_int_t stridx); /* [] -> [val] */
DUK_INTERNAL_DECL duk_bool_t duk_put_prop_stridx(duk_context *ctx, duk_idx_t obj_index, duk_small_int_t stridx); /* [val] -> [] */
@@ -7436,7 +7806,7 @@ DUK_INTERNAL_DECL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr
#define DUK_HOBJECT_FLAG_THREAD DUK_HEAPHDR_USER_FLAG(7) /* object is a thread (duk_hthread) */
#define DUK_HOBJECT_FLAG_ARRAY_PART DUK_HEAPHDR_USER_FLAG(8) /* object has an array part (a_size may still be 0) */
#define DUK_HOBJECT_FLAG_STRICT DUK_HEAPHDR_USER_FLAG(9) /* function: function object is strict */
-#define DUK_HOBJECT_FLAG_NOTAIL DUK_HEAPHDR_USER_FLAG(10) /* function: function must not be tailcalled */
+#define DUK_HOBJECT_FLAG_NOTAIL DUK_HEAPHDR_USER_FLAG(10) /* function: function must not be tail called */
#define DUK_HOBJECT_FLAG_NEWENV DUK_HEAPHDR_USER_FLAG(11) /* function: create new environment when called (see duk_hcompiledfunction) */
#define DUK_HOBJECT_FLAG_NAMEBINDING DUK_HEAPHDR_USER_FLAG(12) /* function: create binding for func name (function templates only, used for named function expressions) */
#define DUK_HOBJECT_FLAG_CREATEARGS DUK_HEAPHDR_USER_FLAG(13) /* function: create an arguments object on function call */
@@ -7799,8 +8169,8 @@ DUK_INTERNAL_DECL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr
(set_e_k) = (duk_hstring **) (void *) ((set_e_pv) + (n_ent)); \
(set_e_f) = (duk_uint8_t *) (void *) ((set_e_k) + (n_ent)); \
(set_a) = (duk_tval *) (void *) (((duk_uint8_t *) (set_e_f)) + \
- sizeof(duk_uint8_t) * (n_ent) + \
- DUK_HOBJECT_E_FLAG_PADDING((n_ent))); \
+ sizeof(duk_uint8_t) * (n_ent) + \
+ DUK_HOBJECT_E_FLAG_PADDING((n_ent))); \
(set_h) = (duk_uint32_t *) (void *) ((set_a) + (n_arr)); \
} while (0)
#elif defined(DUK_USE_HOBJECT_LAYOUT_3)
@@ -8008,7 +8378,7 @@ DUK_INTERNAL_DECL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr
#endif
/* note: this updates refcounts */
-#define DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr,h,p) duk_hobject_set_prototype((thr), (h), (p))
+#define DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr,h,p) duk_hobject_set_prototype_updref((thr), (h), (p))
/*
* Resizing and hash behavior
@@ -8296,7 +8666,7 @@ DUK_INTERNAL_DECL duk_ret_t duk_hobject_get_enumerated_keys(duk_context *ctx, du
DUK_INTERNAL_DECL duk_bool_t duk_hobject_enumerator_next(duk_context *ctx, duk_bool_t get_value);
/* macros */
-DUK_INTERNAL_DECL void duk_hobject_set_prototype(duk_hthread *thr, duk_hobject *h, duk_hobject *p);
+DUK_INTERNAL_DECL void duk_hobject_set_prototype_updref(duk_hthread *thr, duk_hobject *h, duk_hobject *p);
/* finalization */
DUK_INTERNAL_DECL void duk_hobject_run_finalizer(duk_hthread *thr, duk_hobject *obj);
@@ -8625,8 +8995,9 @@ struct duk_hnativefunction {
} else { \
/* No assertions for offset or length; in particular, \
* it's OK for length to be longer than underlying \
- * buffer. \
+ * buffer. Just ensure they don't wrap when added. \
*/ \
+ DUK_ASSERT((h)->offset + (h)->length >= (h)->offset); \
} \
} while (0)
@@ -8710,7 +9081,9 @@ struct duk_hbufferobject {
duk_uint8_t is_view;
};
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL_DECL duk_uint_t duk_hbufferobject_clamp_bytelength(duk_hbufferobject *h_bufobj, duk_uint_t len);
+#endif
DUK_INTERNAL_DECL void duk_hbufferobject_push_validated_read(duk_context *ctx, duk_hbufferobject *h_bufobj, duk_uint8_t *p, duk_small_uint_t elem_size);
DUK_INTERNAL_DECL void duk_hbufferobject_validated_write(duk_context *ctx, duk_hbufferobject *h_bufobj, duk_uint8_t *p, duk_small_uint_t elem_size);
@@ -8767,7 +9140,7 @@ DUK_INTERNAL_DECL void duk_hbufferobject_validated_write(duk_context *ctx, duk_h
*/
#define DUK_ACT_FLAG_STRICT (1 << 0) /* function executes in strict mode */
-#define DUK_ACT_FLAG_TAILCALLED (1 << 1) /* activation has tailcalled one or more times */
+#define DUK_ACT_FLAG_TAILCALLED (1 << 1) /* activation has tail called one or more times */
#define DUK_ACT_FLAG_CONSTRUCT (1 << 2) /* function executes as a constructor (called via "new") */
#define DUK_ACT_FLAG_PREVENT_YIELD (1 << 3) /* activation prevents yield (native call or "new") */
#define DUK_ACT_FLAG_DIRECT_EVAL (1 << 4) /* activation is a direct eval call */
@@ -8873,6 +9246,13 @@ DUK_INTERNAL_DECL void duk_hbufferobject_validated_write(duk_context *ctx, duk_h
* diagnose behavior so it's worth checking even when the check is not 100%.
*/
+#if defined(DUK_USE_PREFER_SIZE)
+#define DUK_ASSERT_CTX_VSSIZE(ctx) /*nop*/
+#else
+#define DUK_ASSERT_CTX_VSSIZE(ctx) \
+ DUK_ASSERT((duk_size_t) (((duk_hthread *) (ctx))->valstack_end - ((duk_hthread *) (ctx))->valstack) == \
+ ((duk_hthread *) (ctx))->valstack_size)
+#endif
#define DUK_ASSERT_CTX_VALID(ctx) do { \
DUK_ASSERT((ctx) != NULL); \
DUK_ASSERT(DUK_HEAPHDR_GET_TYPE((duk_heaphdr *) (ctx)) == DUK_HTYPE_OBJECT); \
@@ -8883,6 +9263,8 @@ DUK_INTERNAL_DECL void duk_hbufferobject_validated_write(duk_context *ctx, duk_h
DUK_ASSERT(((duk_hthread *) (ctx))->valstack_end >= ((duk_hthread *) (ctx))->valstack); \
DUK_ASSERT(((duk_hthread *) (ctx))->valstack_top >= ((duk_hthread *) (ctx))->valstack); \
DUK_ASSERT(((duk_hthread *) (ctx))->valstack_top >= ((duk_hthread *) (ctx))->valstack_bottom); \
+ DUK_ASSERT(((duk_hthread *) (ctx))->valstack_end >= ((duk_hthread *) (ctx))->valstack_top); \
+ DUK_ASSERT_CTX_VSSIZE((ctx)); \
} while (0)
/*
@@ -8906,11 +9288,11 @@ struct duk_activation {
duk_hobject *prev_caller;
#endif
- duk_small_uint_t flags;
- duk_uint32_t pc; /* next instruction to execute */
+ duk_instr_t *curr_pc; /* next instruction to execute (points to 'func' bytecode, stable pointer), NULL for native calls */
#if defined(DUK_USE_DEBUGGER_SUPPORT)
duk_uint32_t prev_line; /* needed for stepping */
#endif
+ duk_small_uint_t flags;
/* idx_bottom and idx_retval are only used for book-keeping of
* Ecmascript-initiated calls, to allow returning to an Ecmascript
@@ -8949,56 +9331,71 @@ struct duk_activation {
struct duk_catcher {
duk_hstring *h_varname; /* borrowed reference to catch variable name (or NULL if none) */
/* (reference is valid as long activation exists) */
+ duk_instr_t *pc_base; /* resume execution from pc_base or pc_base+1 (points to 'func' bytecode, stable pointer) */
duk_size_t callstack_index; /* callstack index of related activation */
duk_size_t idx_base; /* idx_base and idx_base+1 get completion value and type */
- duk_uint32_t pc_base; /* resume execution from pc_base or pc_base+1 */
duk_uint32_t flags; /* type and control flags, label number */
};
struct duk_hthread {
- /* shared object part */
+ /* Shared object part */
duk_hobject obj;
- /* backpointers */
+ /* Pointer to bytecode executor's 'curr_pc' variable. Used to copy
+ * the current PC back into the topmost activation when activation
+ * state is about to change (or "syncing" is otherwise needed). This
+ * is rather awkward but important for performance, see execution.rst.
+ */
+ duk_instr_t **ptr_curr_pc;
+
+ /* Backpointers. */
duk_heap *heap;
- /* current strictness flag: affects API calls */
+ /* Current strictness flag: affects API calls. */
duk_uint8_t strict;
+
+ /* Thread state. */
duk_uint8_t state;
duk_uint8_t unused1;
duk_uint8_t unused2;
- /* sanity limits */
+ /* Sanity limits for stack sizes. */
duk_size_t valstack_max;
duk_size_t callstack_max;
duk_size_t catchstack_max;
- /* XXX: valstack, callstack, and catchstack are currently assumed
+ /* XXX: Valstack, callstack, and catchstack are currently assumed
* to have non-NULL pointers. Relaxing this would not lead to big
* benefits (except perhaps for terminated threads).
*/
- /* value stack: these are expressed as pointers for faster stack manipulation */
+ /* Value stack: these are expressed as pointers for faster stack manipulation.
+ * [valstack,valstack_top[ is GC-reachable, [valstack_top,valstack_end[ is
+ * not GC-reachable but kept initialized as 'undefined'.
+ */
duk_tval *valstack; /* start of valstack allocation */
duk_tval *valstack_end; /* end of valstack allocation (exclusive) */
duk_tval *valstack_bottom; /* bottom of current frame */
duk_tval *valstack_top; /* top of current frame (exclusive) */
+#if !defined(DUK_USE_PREFER_SIZE)
+ duk_size_t valstack_size; /* cached: valstack_end - valstack (in entries, not bytes) */
+#endif
- /* call stack */
+ /* Call stack. [0,callstack_top[ is GC reachable. */
duk_activation *callstack;
duk_size_t callstack_size; /* allocation size */
duk_size_t callstack_top; /* next to use, highest used is top - 1 */
duk_size_t callstack_preventcount; /* number of activation records in callstack preventing a yield */
- /* catch stack */
+ /* Catch stack. [0,catchstack_top[ is GC reachable. */
duk_catcher *catchstack;
duk_size_t catchstack_size; /* allocation size */
duk_size_t catchstack_top; /* next to use, highest used is top - 1 */
- /* yield/resume book-keeping */
+ /* Yield/resume book-keeping. */
duk_hthread *resumer; /* who resumed us (if any) */
- /* current compiler state (if any), used for augmenting SyntaxErrors */
+ /* Current compiler state (if any), used for augmenting SyntaxErrors. */
duk_compiler_ctx *compile_ctx;
#if defined(DUK_USE_INTERRUPT_COUNTER)
@@ -9022,7 +9419,7 @@ struct duk_hthread {
*/
duk_hobject *builtins[DUK_NUM_BUILTINS];
- /* convenience copies from heap/vm for faster access */
+ /* Convenience copies from heap/vm for faster access. */
#if defined(DUK_USE_HEAPPTR16)
duk_uint16_t *strs16;
#else
@@ -9051,6 +9448,13 @@ DUK_INTERNAL_DECL void *duk_hthread_get_valstack_ptr(duk_heap *heap, void *ud);
DUK_INTERNAL_DECL void *duk_hthread_get_callstack_ptr(duk_heap *heap, void *ud); /* indirect allocs */
DUK_INTERNAL_DECL void *duk_hthread_get_catchstack_ptr(duk_heap *heap, void *ud); /* indirect allocs */
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+DUK_INTERNAL_DECL duk_uint_fast32_t duk_hthread_get_act_curr_pc(duk_hthread *thr, duk_activation *act);
+#endif
+DUK_INTERNAL_DECL duk_uint_fast32_t duk_hthread_get_act_prev_pc(duk_hthread *thr, duk_activation *act);
+DUK_INTERNAL_DECL void duk_hthread_sync_currpc(duk_hthread *thr);
+DUK_INTERNAL_DECL void duk_hthread_sync_and_null_currpc(duk_hthread *thr);
+
#endif /* DUK_HTHREAD_H_INCLUDED */
#line 1 "duk_hbuffer.h"
/*
@@ -9069,17 +9473,23 @@ DUK_INTERNAL_DECL void *duk_hthread_get_catchstack_ptr(duk_heap *heap, void *ud)
/*
* Flags
+ *
+ * Fixed buffer: 0
+ * Dynamic buffer: DUK_HBUFFER_FLAG_DYNAMIC
+ * External buffer: DUK_HBUFFER_FLAG_DYNAMIC | DUK_HBUFFER_FLAG_EXTERNAL
*/
-#define DUK_HBUFFER_FLAG_DYNAMIC DUK_HEAPHDR_USER_FLAG(0) /* buffer is resizable */
+#define DUK_HBUFFER_FLAG_DYNAMIC DUK_HEAPHDR_USER_FLAG(0) /* buffer is behind a pointer, dynamic or external */
+#define DUK_HBUFFER_FLAG_EXTERNAL DUK_HEAPHDR_USER_FLAG(1) /* buffer pointer is to an externally allocated buffer */
#define DUK_HBUFFER_HAS_DYNAMIC(x) DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
+#define DUK_HBUFFER_HAS_EXTERNAL(x) DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
#define DUK_HBUFFER_SET_DYNAMIC(x) DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
+#define DUK_HBUFFER_SET_EXTERNAL(x) DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
#define DUK_HBUFFER_CLEAR_DYNAMIC(x) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
-
-#define DUK_HBUFFER_FIXED_GET_DATA_PTR(heap,x) ((duk_uint8_t *) (((duk_hbuffer_fixed *) (x)) + 1))
+#define DUK_HBUFFER_CLEAR_EXTERNAL(x) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
/*
* Misc defines
@@ -9140,6 +9550,11 @@ DUK_INTERNAL_DECL void *duk_hthread_get_catchstack_ptr(duk_heap *heap, void *ud)
#define DUK_HBUFFER_DYNAMIC_ADD_SIZE(x,dv) DUK_HBUFFER_ADD_SIZE((duk_hbuffer *) (x), (dv))
#define DUK_HBUFFER_DYNAMIC_SUB_SIZE(x,dv) DUK_HBUFFER_SUB_SIZE((duk_hbuffer *) (x), (dv))
+#define DUK_HBUFFER_EXTERNAL_GET_SIZE(x) DUK_HBUFFER_GET_SIZE((duk_hbuffer *) (x))
+#define DUK_HBUFFER_EXTERNAL_SET_SIZE(x,v) DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x), (v))
+
+#define DUK_HBUFFER_FIXED_GET_DATA_PTR(heap,x) ((duk_uint8_t *) (((duk_hbuffer_fixed *) (x)) + 1))
+
#if defined(DUK_USE_HEAPPTR16)
#define DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap,x) \
((void *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, ((duk_heaphdr *) (x))->h_extra16))
@@ -9159,19 +9574,58 @@ DUK_INTERNAL_DECL void *duk_hthread_get_catchstack_ptr(duk_heap *heap, void *ud)
} while (0)
#endif
-/* Gets the actual buffer contents which matches the current allocation size
- * (may be NULL for zero size dynamic buffer).
+/* No pointer compression because pointer is potentially outside of
+ * Duktape heap.
+ */
+#if defined(DUK_USE_HEAPPTR16)
+#define DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap,x) \
+ ((void *) (x)->curr_alloc)
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap,x,v) do { \
+ (x)->curr_alloc = (void *) (v); \
+ } while (0)
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR_NULL(heap,x) do { \
+ (x)->curr_alloc = (void *) NULL; \
+ } while (0)
+#else
+#define DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap,x) \
+ ((void *) (x)->curr_alloc)
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap,x,v) do { \
+ (x)->curr_alloc = (void *) (v); \
+ } while (0)
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR_NULL(heap,x) do { \
+ (x)->curr_alloc = (void *) NULL; \
+ } while (0)
+#endif
+
+/* Get a pointer to the current buffer contents (matching current allocation
+ * size). May be NULL for zero size dynamic/external buffer.
+ */
+#if defined(DUK_USE_HEAPPTR16)
+#define DUK_HBUFFER_GET_DATA_PTR(heap,x) ( \
+ DUK_HBUFFER_HAS_DYNAMIC((x)) ? \
+ ( \
+ DUK_HBUFFER_HAS_EXTERNAL((x)) ? \
+ DUK_HBUFFER_EXTERNAL_GET_DATA_PTR((heap), (duk_hbuffer_external *) (x)) : \
+ DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((heap), (duk_hbuffer_dynamic *) (x)) \
+ ) : \
+ DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), (duk_hbuffer_fixed *) (x)) \
+ )
+#else
+/* Without heap pointer compression duk_hbuffer_dynamic and duk_hbuffer_external
+ * have the same layout so checking for fixed vs. dynamic (or external) is enough.
*/
#define DUK_HBUFFER_GET_DATA_PTR(heap,x) ( \
DUK_HBUFFER_HAS_DYNAMIC((x)) ? \
DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((heap), (duk_hbuffer_dynamic *) (x)) : \
DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), (duk_hbuffer_fixed *) (x)) \
)
+#endif
/*
* Structs
*/
+/* Shared prefix for all buffer types. */
struct duk_hbuffer {
duk_heaphdr hdr;
@@ -9199,6 +9653,11 @@ struct duk_hbuffer {
* - a "void *" pointing to the current allocation
* - a duk_size_t indicating the full allocated size (always >= 'size')
*
+ * If DUK_HBUFFER_FLAG_EXTERNAL is set, the buffer has been allocated
+ * by user code, so that Duktape won't be able to resize it and won't
+ * free it. This allows buffers to point to e.g. an externally
+ * allocated structure such as a frame buffer.
+ *
* Unlike strings, no terminator byte (NUL) is guaranteed after the
* data. This would be convenient, but would pad aligned user buffers
* unnecessarily upwards in size. For instance, if user code requested
@@ -9207,6 +9666,9 @@ struct duk_hbuffer {
*/
};
+/* Fixed buffer; data follows struct, with proper alignment guaranteed by
+ * struct size.
+ */
#if (DUK_USE_ALIGN_BY == 8) && defined(DUK_USE_PACK_MSVC_PRAGMA)
#pragma pack(push, 8)
#endif
@@ -9260,6 +9722,10 @@ __attribute__ ((aligned (8)))
#pragma pack(pop)
#endif
+/* Dynamic buffer with 'curr_alloc' pointing to a dynamic area allocated using
+ * heap allocation primitives. Also used for external buffers when low memory
+ * options are not used.
+ */
struct duk_hbuffer_dynamic {
duk_heaphdr hdr;
@@ -9285,11 +9751,30 @@ struct duk_hbuffer_dynamic {
*/
};
+/* External buffer with 'curr_alloc' managed by user code and pointing to an
+ * arbitrary address. When heap pointer compression is not used, this struct
+ * has the same layout as duk_hbuffer_dynamic.
+ */
+struct duk_hbuffer_external {
+ duk_heaphdr hdr;
+
+#if defined(DUK_USE_BUFLEN16)
+ /* Stored in duk_heaphdr unused flags. */
+#else
+ duk_size_t size;
+#endif
+
+ /* Cannot be compressed as a heap pointer because may point to
+ * an arbitrary address.
+ */
+ void *curr_alloc; /* may be NULL if alloc_size == 0 */
+};
+
/*
* Prototypes
*/
-DUK_INTERNAL_DECL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk_small_uint_t flags);
+DUK_INTERNAL_DECL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk_small_uint_t flags, void **out_bufdata);
DUK_INTERNAL_DECL void *duk_hbuffer_get_dynalloc_ptr(duk_heap *heap, void *ud); /* indirect allocs */
/* dynamic buffer ops */
@@ -9351,13 +9836,13 @@ DUK_INTERNAL_DECL void duk_hbuffer_reset(duk_hthread *thr, duk_hbuffer_dynamic *
*/
#define DUK_LJ_TYPE_UNKNOWN 0 /* unused */
-#define DUK_LJ_TYPE_RETURN 1 /* value1 -> return value */
-#define DUK_LJ_TYPE_THROW 2 /* value1 -> error object */
-#define DUK_LJ_TYPE_BREAK 3 /* value1 -> label number */
-#define DUK_LJ_TYPE_CONTINUE 4 /* value1 -> label number */
-#define DUK_LJ_TYPE_YIELD 5 /* value1 -> yield value, iserror -> error / normal */
-#define DUK_LJ_TYPE_RESUME 6 /* value1 -> resume value, value2 -> resumee thread, iserror -> error/normal */
-#define DUK_LJ_TYPE_NORMAL 7 /* pseudo-type to indicate a normal continuation (for 'finally' rethrowing) */
+#define DUK_LJ_TYPE_THROW 1 /* value1 -> error object */
+#define DUK_LJ_TYPE_YIELD 2 /* value1 -> yield value, iserror -> error / normal */
+#define DUK_LJ_TYPE_RESUME 3 /* value1 -> resume value, value2 -> resumee thread, iserror -> error/normal */
+#define DUK_LJ_TYPE_BREAK 4 /* value1 -> label number, pseudo-type to indicate a break continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_CONTINUE 5 /* value1 -> label number, pseudo-type to indicate a continue continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_RETURN 6 /* value1 -> return value, pseudo-type to indicate a return continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_NORMAL 7 /* no value, pseudo-type to indicate a normal continuation (for ENDFIN) */
/*
* Mark-and-sweep flags
@@ -9392,31 +9877,6 @@ DUK_INTERNAL_DECL void duk_hbuffer_reset(duk_hthread *thr, duk_hbuffer_dynamic *
* Other heap related defines
*/
-/* Maximum duk_handle_call / duk_handle_safe_call depth. Note that this
- * does not limit bytecode executor internal call depth at all (e.g.
- * for Ecmascript-to-Ecmascript calls, thread yields/resumes, etc).
- * There is a separate callstack depth limit for threads.
- */
-
-#if defined(DUK_USE_DEEP_C_STACK)
-#define DUK_HEAP_DEFAULT_CALL_RECURSION_LIMIT 1000 /* assuming 0.5 kB between calls, about 500kB of stack */
-#else
-#define DUK_HEAP_DEFAULT_CALL_RECURSION_LIMIT 60 /* assuming 0.5 kB between calls, about 30kB of stack */
-#endif
-
-/* Mark-and-sweep C recursion depth for marking phase; if reached,
- * mark object as a TEMPROOT and use multi-pass marking.
- */
-#if defined(DUK_USE_MARK_AND_SWEEP)
-#if defined(DUK_USE_GC_TORTURE)
-#define DUK_HEAP_MARK_AND_SWEEP_RECURSION_LIMIT 3
-#elif defined(DUK_USE_DEEP_C_STACK)
-#define DUK_HEAP_MARK_AND_SWEEP_RECURSION_LIMIT 256
-#else
-#define DUK_HEAP_MARK_AND_SWEEP_RECURSION_LIMIT 32
-#endif
-#endif
-
/* Mark-and-sweep interval is relative to combined count of objects and
* strings kept in the heap during the latest mark-and-sweep pass.
* Fixed point .8 multiplier and .0 adder. Trigger count (interval) is
@@ -9758,6 +10218,7 @@ struct duk_heap {
duk_bool_t dbg_processing; /* currently processing messages or breakpoints: don't enter message processing recursively (e.g. no breakpoints when processing debugger eval) */
duk_bool_t dbg_paused; /* currently paused: talk with debug client until step/resume */
duk_bool_t dbg_state_dirty; /* resend state next time executor is about to run */
+ duk_bool_t dbg_force_restart; /* force executor restart to recheck breakpoints; used to handle function returns (see GH-303) */
duk_small_uint_t dbg_step_type; /* step type: none, step into, step over, step out */
duk_hthread *dbg_step_thread; /* borrowed; NULL if no step state (NULLed in unwind) */
duk_size_t dbg_step_csindex; /* callstack index */
@@ -9838,7 +10299,9 @@ DUK_INTERNAL_DECL duk_hstring *duk_heap_string_lookup_u32(duk_heap *heap, duk_ui
#endif
DUK_INTERNAL_DECL duk_hstring *duk_heap_string_intern_u32(duk_heap *heap, duk_uint32_t val);
DUK_INTERNAL_DECL duk_hstring *duk_heap_string_intern_u32_checked(duk_hthread *thr, duk_uint32_t val);
+#if defined(DUK_USE_REFERENCE_COUNTING)
DUK_INTERNAL_DECL void duk_heap_string_remove(duk_heap *heap, duk_hstring *h);
+#endif
#if defined(DUK_USE_MARK_AND_SWEEP) && defined(DUK_USE_MS_STRINGTABLE_RESIZE)
DUK_INTERNAL_DECL void duk_heap_force_strtab_resize(duk_heap *heap);
#endif
@@ -9917,6 +10380,7 @@ DUK_INTERNAL_DECL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uin
#define DUK_DBG_CMD_PRINT 0x02
#define DUK_DBG_CMD_ALERT 0x03
#define DUK_DBG_CMD_LOG 0x04
+#define DUK_DBG_CMD_THROW 0x05
/* Initiated by debug client */
#define DUK_DBG_CMD_BASICINFO 0x10
@@ -9984,7 +10448,9 @@ DUK_INTERNAL_DECL void duk_debug_write_eom(duk_hthread *thr);
DUK_INTERNAL duk_uint_fast32_t duk_debug_curr_line(duk_hthread *thr);
DUK_INTERNAL void duk_debug_send_status(duk_hthread *thr);
+DUK_INTERNAL_DECL void duk_debug_send_throw(duk_hthread *thr, duk_bool_t fatal);
+DUK_INTERNAL_DECL void duk_debug_halt_execution(duk_hthread *thr, duk_bool_t use_prev_pc);
DUK_INTERNAL_DECL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t no_block);
DUK_INTERNAL_DECL duk_small_int_t duk_debug_add_breakpoint(duk_hthread *thr, duk_hstring *filename, duk_uint32_t line);
@@ -10365,9 +10831,9 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
#if defined(DUK_USE_ASSERTIONS) && defined(DUK_USE_PACKED_TVAL)
#define DUK_ASSERT_DOUBLE_IS_NORMALIZED(dval) do { \
- duk_double_union assert_tmp_du; \
- assert_tmp_du.d = (dval); \
- DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&assert_tmp_du)); \
+ duk_double_union duk__assert_tmp_du; \
+ duk__assert_tmp_du.d = (dval); \
+ DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&duk__assert_tmp_du)); \
} while (0)
#else
#define DUK_ASSERT_DOUBLE_IS_NORMALIZED(dval) /* nop */
@@ -10666,6 +11132,13 @@ extern const duk_uint8_t duk_unicode_idp_m_ids_noabmp[348];
extern const duk_uint8_t duk_unicode_caseconv_uc[1288];
extern const duk_uint8_t duk_unicode_caseconv_lc[616];
+/* FIXME: CONDITIONAL */
+/*
+ * Automatically generated by extract_caseconv.py, do not edit!
+ */
+
+extern const duk_uint16_t duk_unicode_re_canon_lookup[65536];
+
/*
* Extern
*/
@@ -10712,15 +11185,6 @@ DUK_INTERNAL_DECL duk_small_int_t duk_unicode_re_is_wordchar(duk_codepoint_t cp)
#ifndef DUK_JSON_H_INCLUDED
#define DUK_JSON_H_INCLUDED
-/* Object/array recursion limit (to protect C stack) */
-#if defined(DUK_USE_DEEP_C_STACK)
-#define DUK_JSON_ENC_RECURSION_LIMIT 1000
-#define DUK_JSON_DEC_RECURSION_LIMIT 1000
-#else
-#define DUK_JSON_ENC_RECURSION_LIMIT 100
-#define DUK_JSON_DEC_RECURSION_LIMIT 100
-#endif
-
/* Encoding/decoding flags */
#define DUK_JSON_FLAG_ASCII_ONLY (1 << 0) /* escape any non-ASCII characters */
#define DUK_JSON_FLAG_AVOID_KEY_QUOTES (1 << 1) /* avoid key quotes when key is an ASCII Identifier */
@@ -10798,7 +11262,7 @@ typedef struct {
#define DUK_CALL_FLAG_IGNORE_RECLIMIT (1 << 1) /* duk_handle_call: call ignores C recursion limit (for errhandler calls) */
#define DUK_CALL_FLAG_CONSTRUCTOR_CALL (1 << 2) /* duk_handle_call: constructor call (i.e. called as 'new Foo()') */
#define DUK_CALL_FLAG_IS_RESUME (1 << 3) /* duk_handle_ecma_call_setup: setup for a resume() */
-#define DUK_CALL_FLAG_IS_TAILCALL (1 << 4) /* duk_handle_ecma_call_setup: setup for a tailcall */
+#define DUK_CALL_FLAG_IS_TAILCALL (1 << 4) /* duk_handle_ecma_call_setup: setup for a tail call */
#define DUK_CALL_FLAG_DIRECT_EVAL (1 << 5) /* call is a direct eval call */
/* Flags for duk_js_equals_helper(). */
@@ -11252,7 +11716,7 @@ DUK_INTERNAL const char *duk_str_buffer_too_long = "buffer too long";
DUK_INTERNAL const char *duk_str_sprintf_too_long = "sprintf message too long";
DUK_INTERNAL const char *duk_str_alloc_failed = "alloc failed";
DUK_INTERNAL const char *duk_str_pop_too_many = "attempt to pop too many entries";
-DUK_INTERNAL const char *duk_str_buffer_not_dynamic = "buffer is not dynamic";
+DUK_INTERNAL const char *duk_str_wrong_buffer_type = "wrong buffer type";
DUK_INTERNAL const char *duk_str_failed_to_extend_valstack = "failed to extend valstack";
DUK_INTERNAL const char *duk_str_encode_failed = "encode failed";
DUK_INTERNAL const char *duk_str_decode_failed = "decode failed";
@@ -11866,7 +12330,7 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[1952] = {
156,80,0,70,82,113,64,1,89,41,197,0,6,100,39,20,0,29,142,156,80,0,134,50,
98,243,21,53,121,136,160,144,0,22,26,120,24,73,197,0,9,96,167,20,0,41,128,
156,80,0,181,250,113,64,3,1,255,254,0,81,20,100,47,145,216,23,255,240,0,11,
-255,248,0,3,255,252,81,252,0,0,0,0,8,1,220,68,0,129,167,1,26,144,9,165,0,
+255,248,0,3,255,252,81,252,0,0,0,0,8,4,252,68,0,129,167,1,26,144,9,165,0,
26,177,199,197,132,30,147,16,120,86,65,217,80,240,232,164,120,114,80,60,52,
39,32,84,223,192,15,59,30,129,156,115,6,81,160,7,253,40,0,5,81,252,0,1,255,
78,0,84,113,96,128,0,209,69,128,21,87,240,0,7,253,72,1,81,221,66,0,3,69,
@@ -11898,16 +12362,90 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[1952] = {
106,0,
};
#ifdef DUK_USE_BUILTIN_INITJS
-DUK_INTERNAL const duk_uint8_t duk_initjs_data[187] = {
-40,102,117,110,99,116,105,111,110,40,100,44,97,41,123,102,117,110,99,116,
-105,111,110,32,98,40,97,44,98,44,99,41,123,79,98,106,101,99,116,46,100,101,
-102,105,110,101,80,114,111,112,101,114,116,121,40,97,44,98,44,123,118,97,
-108,117,101,58,99,44,119,114,105,116,97,98,108,101,58,33,48,44,101,110,117,
-109,101,114,97,98,108,101,58,33,49,44,99,111,110,102,105,103,117,114,97,98,
-108,101,58,33,48,125,41,125,98,40,97,46,76,111,103,103,101,114,44,34,99,
-108,111,103,34,44,110,101,119,32,97,46,76,111,103,103,101,114,40,34,67,34,
-41,41,59,98,40,97,44,34,109,111,100,76,111,97,100,101,100,34,44,123,125,41,
-125,41,40,116,104,105,115,44,68,117,107,116,97,112,101,41,59,10,0,
+DUK_INTERNAL const duk_uint8_t duk_initjs_data[1757] = {
+47,42,10,32,42,32,32,73,110,105,116,32,99,111,100,101,32,102,111,114,32,
+108,101,103,97,99,121,32,99,111,109,112,97,116,105,98,105,108,105,116,121,
+46,10,32,42,10,32,42,32,32,67,111,109,112,97,116,105,98,105,108,105,116,
+121,32,112,114,111,112,101,114,116,105,101,115,32,47,32,119,114,97,112,112,
+101,114,32,102,117,110,99,116,105,111,110,115,32,104,101,114,101,32,97,108,
+108,111,119,32,68,117,107,116,97,112,101,32,116,111,32,114,101,109,97,105,
+110,10,32,42,32,32,99,111,109,112,97,116,105,98,108,101,32,102,111,114,32,
+117,115,101,114,32,99,111,100,101,32,119,104,101,110,32,99,111,114,101,32,
+102,101,97,116,117,114,101,115,32,97,114,101,32,99,104,97,110,103,101,100,
+44,32,119,105,116,104,111,117,116,32,98,117,114,100,101,110,105,110,103,10,
+32,42,32,32,116,104,101,32,109,97,105,110,32,67,32,99,111,100,101,32,119,
+105,116,104,32,99,111,109,112,97,116,105,98,105,108,105,116,121,32,115,116,
+117,102,102,46,10,32,42,10,32,42,32,32,84,104,105,115,32,102,105,108,101,
+32,105,115,32,109,105,110,105,102,105,101,100,32,119,105,116,104,32,85,103,
+108,105,102,121,74,83,32,111,114,32,116,104,101,32,99,108,111,115,117,114,
+101,32,99,111,109,112,105,108,101,114,46,32,32,66,111,116,104,32,119,105,
+108,108,10,32,42,32,32,114,101,110,97,109,101,32,118,97,114,105,97,98,108,
+101,115,44,32,114,101,109,111,118,101,32,99,111,109,109,101,110,116,115,44,
+32,97,110,100,32,97,114,101,32,99,108,101,118,101,114,32,101,110,111,117,
+103,104,32,116,111,32,100,114,111,112,32,97,110,121,10,32,42,32,32,34,105,
+102,32,40,102,97,108,115,101,41,32,123,32,46,46,46,32,125,34,32,98,108,111,
+99,107,115,32,97,108,116,111,103,101,116,104,101,114,44,32,115,111,32,116,
+104,97,116,39,115,32,97,110,32,101,102,102,101,99,116,105,118,101,32,119,
+97,121,32,116,111,10,32,42,32,32,100,105,115,97,98,108,101,32,99,117,114,
+114,101,110,116,108,121,32,117,110,110,101,101,100,101,100,32,99,111,100,
+101,46,10,32,42,47,10,10,40,102,117,110,99,116,105,111,110,40,71,44,32,68,
+41,32,123,10,32,32,32,32,39,117,115,101,32,115,116,114,105,99,116,39,59,10,
+10,32,32,32,32,102,117,110,99,116,105,111,110,32,100,101,102,40,111,98,106,
+101,99,116,44,32,110,97,109,101,44,32,118,97,108,117,101,41,32,123,10,32,
+32,32,32,32,32,32,32,79,98,106,101,99,116,46,100,101,102,105,110,101,80,
+114,111,112,101,114,116,121,40,111,98,106,101,99,116,44,32,110,97,109,101,
+44,32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,118,97,108,117,101,58,32,
+118,97,108,117,101,44,10,32,32,32,32,32,32,32,32,32,32,32,32,119,114,105,
+116,97,98,108,101,58,32,116,114,117,101,44,10,32,32,32,32,32,32,32,32,32,
+32,32,32,101,110,117,109,101,114,97,98,108,101,58,32,102,97,108,115,101,44,
+10,32,32,32,32,32,32,32,32,32,32,32,32,99,111,110,102,105,103,117,114,97,
+98,108,101,58,32,116,114,117,101,10,32,32,32,32,32,32,32,32,125,41,59,10,
+32,32,32,32,125,10,10,32,32,32,32,102,117,110,99,116,105,111,110,32,100,
+101,102,68,40,110,97,109,101,44,32,118,97,108,117,101,41,32,123,10,32,32,
+32,32,32,32,32,32,100,101,102,40,68,44,32,110,97,109,101,44,32,118,97,108,
+117,101,41,59,10,32,32,32,32,125,10,10,32,32,32,32,47,47,32,67,111,109,112,
+97,116,105,98,105,108,105,116,121,32,102,111,114,32,39,99,111,110,115,111,
+108,101,46,108,111,103,39,46,10,32,32,32,32,105,102,32,40,102,97,108,115,
+101,41,32,123,10,32,32,32,32,32,32,32,32,99,111,110,115,111,108,101,32,61,
+32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,108,111,103,58,32,102,117,
+110,99,116,105,111,110,40,41,32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,112,114,105,110,116,40,65,114,114,97,121,46,112,114,111,116,
+111,116,121,112,101,46,106,111,105,110,46,99,97,108,108,40,97,114,103,117,
+109,101,110,116,115,44,32,39,32,39,41,41,59,10,32,32,32,32,32,32,32,32,32,
+32,32,32,125,10,32,32,32,32,32,32,32,32,125,59,10,32,32,32,32,125,10,10,32,
+32,32,32,47,47,32,68,117,107,116,97,112,101,46,108,105,110,101,40,41,32,
+119,97,115,32,114,101,109,111,118,101,100,32,105,110,32,68,117,107,116,97,
+112,101,32,48,46,49,49,46,48,44,32,104,101,114,101,39,115,32,97,110,32,101,
+120,97,109,112,108,101,10,32,32,32,32,47,47,32,114,101,112,108,97,99,101,
+109,101,110,116,32,117,115,101,114,32,99,111,100,101,32,99,111,117,108,100,
+32,117,115,101,46,10,32,32,32,32,105,102,32,40,102,97,108,115,101,41,32,
+123,10,32,32,32,32,32,32,32,32,100,101,102,40,68,44,32,39,108,105,110,101,
+39,44,32,102,117,110,99,116,105,111,110,32,40,41,32,123,10,32,32,32,32,32,
+32,32,32,32,32,32,32,39,117,115,101,32,100,117,107,32,110,111,116,97,105,
+108,39,59,10,10,32,32,32,32,32,32,32,32,32,32,32,32,47,42,32,84,97,105,108,
+32,99,97,108,108,115,32,97,114,101,32,112,114,101,118,101,110,116,101,100,
+32,116,111,32,101,110,115,117,114,101,32,99,97,108,108,105,110,103,32,97,
+99,116,105,118,97,116,105,111,110,32,101,120,105,115,116,115,46,10,32,32,
+32,32,32,32,32,32,32,32,32,32,32,42,32,67,97,108,108,32,115,116,97,99,107,
+32,105,110,100,105,99,101,115,58,32,45,49,32,61,32,68,117,107,116,97,112,
+101,46,97,99,116,44,32,45,50,32,61,32,103,101,116,67,117,114,114,101,110,
+116,76,105,110,101,44,32,45,51,32,61,32,99,97,108,108,101,114,10,32,32,32,
+32,32,32,32,32,32,32,32,32,32,42,47,10,10,32,32,32,32,32,32,32,32,32,32,32,
+32,114,101,116,117,114,110,32,40,68,117,107,116,97,112,101,46,97,99,116,40,
+45,51,41,32,124,124,32,123,125,41,46,108,105,110,101,78,117,109,98,101,114,
+59,10,32,32,32,32,32,32,32,32,125,41,59,10,32,32,32,32,125,10,10,32,32,32,
+32,47,47,32,76,111,103,103,101,114,32,111,98,106,101,99,116,32,102,111,114,
+32,67,32,99,111,100,101,32,112,114,111,118,105,100,101,100,32,98,121,32,
+105,110,105,116,32,99,111,100,101,32,110,111,119,46,10,32,32,32,32,105,102,
+32,40,116,114,117,101,41,32,123,10,32,32,32,32,32,32,32,32,100,101,102,40,
+68,46,76,111,103,103,101,114,44,32,39,99,108,111,103,39,44,32,110,101,119,
+32,68,46,76,111,103,103,101,114,40,39,67,39,41,41,59,10,32,32,32,32,125,10,
+10,32,32,32,32,47,47,32,84,114,97,99,107,105,110,103,32,116,97,98,108,101,
+32,102,111,114,32,67,111,109,109,111,110,74,83,32,109,111,100,117,108,101,
+32,108,111,97,100,105,110,103,46,10,32,32,32,32,105,102,32,40,116,114,117,
+101,41,32,123,10,32,32,32,32,32,32,32,32,100,101,102,40,68,44,32,39,109,
+111,100,76,111,97,100,101,100,39,44,32,123,125,41,59,10,32,32,32,32,125,10,
+125,41,40,116,104,105,115,44,32,68,117,107,116,97,112,101,41,59,10,0,
};
#endif /* DUK_USE_BUILTIN_INITJS */
#elif defined(DUK_USE_DOUBLE_BE)
@@ -12252,7 +12790,7 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[1952] = {
80,0,70,82,113,64,1,89,41,197,0,6,100,39,20,0,29,142,156,80,0,134,50,98,
243,21,53,121,136,160,144,0,22,26,120,24,73,197,0,9,96,167,20,0,41,128,156,
80,0,181,250,113,64,3,1,255,254,0,81,20,100,47,145,216,23,255,240,0,11,255,
-248,0,3,255,252,81,252,4,12,65,216,0,0,0,0,0,129,167,1,26,144,9,165,0,26,
+248,0,3,255,252,81,252,4,12,68,248,0,0,0,0,0,129,167,1,26,144,9,165,0,26,
177,199,197,132,30,147,16,120,86,65,217,80,240,232,164,120,114,80,60,52,39,
32,84,223,192,15,59,30,129,156,115,6,81,160,7,253,40,0,5,81,252,0,1,255,78,
0,84,113,96,128,0,209,69,128,21,87,240,0,7,253,72,1,81,221,66,0,3,69,117,0,
@@ -12283,16 +12821,90 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[1952] = {
157,85,98,112,80,137,241,66,128,0,166,213,33,53,24,66,121,106,0,
};
#ifdef DUK_USE_BUILTIN_INITJS
-DUK_INTERNAL const duk_uint8_t duk_initjs_data[187] = {
-40,102,117,110,99,116,105,111,110,40,100,44,97,41,123,102,117,110,99,116,
-105,111,110,32,98,40,97,44,98,44,99,41,123,79,98,106,101,99,116,46,100,101,
-102,105,110,101,80,114,111,112,101,114,116,121,40,97,44,98,44,123,118,97,
-108,117,101,58,99,44,119,114,105,116,97,98,108,101,58,33,48,44,101,110,117,
-109,101,114,97,98,108,101,58,33,49,44,99,111,110,102,105,103,117,114,97,98,
-108,101,58,33,48,125,41,125,98,40,97,46,76,111,103,103,101,114,44,34,99,
-108,111,103,34,44,110,101,119,32,97,46,76,111,103,103,101,114,40,34,67,34,
-41,41,59,98,40,97,44,34,109,111,100,76,111,97,100,101,100,34,44,123,125,41,
-125,41,40,116,104,105,115,44,68,117,107,116,97,112,101,41,59,10,0,
+DUK_INTERNAL const duk_uint8_t duk_initjs_data[1757] = {
+47,42,10,32,42,32,32,73,110,105,116,32,99,111,100,101,32,102,111,114,32,
+108,101,103,97,99,121,32,99,111,109,112,97,116,105,98,105,108,105,116,121,
+46,10,32,42,10,32,42,32,32,67,111,109,112,97,116,105,98,105,108,105,116,
+121,32,112,114,111,112,101,114,116,105,101,115,32,47,32,119,114,97,112,112,
+101,114,32,102,117,110,99,116,105,111,110,115,32,104,101,114,101,32,97,108,
+108,111,119,32,68,117,107,116,97,112,101,32,116,111,32,114,101,109,97,105,
+110,10,32,42,32,32,99,111,109,112,97,116,105,98,108,101,32,102,111,114,32,
+117,115,101,114,32,99,111,100,101,32,119,104,101,110,32,99,111,114,101,32,
+102,101,97,116,117,114,101,115,32,97,114,101,32,99,104,97,110,103,101,100,
+44,32,119,105,116,104,111,117,116,32,98,117,114,100,101,110,105,110,103,10,
+32,42,32,32,116,104,101,32,109,97,105,110,32,67,32,99,111,100,101,32,119,
+105,116,104,32,99,111,109,112,97,116,105,98,105,108,105,116,121,32,115,116,
+117,102,102,46,10,32,42,10,32,42,32,32,84,104,105,115,32,102,105,108,101,
+32,105,115,32,109,105,110,105,102,105,101,100,32,119,105,116,104,32,85,103,
+108,105,102,121,74,83,32,111,114,32,116,104,101,32,99,108,111,115,117,114,
+101,32,99,111,109,112,105,108,101,114,46,32,32,66,111,116,104,32,119,105,
+108,108,10,32,42,32,32,114,101,110,97,109,101,32,118,97,114,105,97,98,108,
+101,115,44,32,114,101,109,111,118,101,32,99,111,109,109,101,110,116,115,44,
+32,97,110,100,32,97,114,101,32,99,108,101,118,101,114,32,101,110,111,117,
+103,104,32,116,111,32,100,114,111,112,32,97,110,121,10,32,42,32,32,34,105,
+102,32,40,102,97,108,115,101,41,32,123,32,46,46,46,32,125,34,32,98,108,111,
+99,107,115,32,97,108,116,111,103,101,116,104,101,114,44,32,115,111,32,116,
+104,97,116,39,115,32,97,110,32,101,102,102,101,99,116,105,118,101,32,119,
+97,121,32,116,111,10,32,42,32,32,100,105,115,97,98,108,101,32,99,117,114,
+114,101,110,116,108,121,32,117,110,110,101,101,100,101,100,32,99,111,100,
+101,46,10,32,42,47,10,10,40,102,117,110,99,116,105,111,110,40,71,44,32,68,
+41,32,123,10,32,32,32,32,39,117,115,101,32,115,116,114,105,99,116,39,59,10,
+10,32,32,32,32,102,117,110,99,116,105,111,110,32,100,101,102,40,111,98,106,
+101,99,116,44,32,110,97,109,101,44,32,118,97,108,117,101,41,32,123,10,32,
+32,32,32,32,32,32,32,79,98,106,101,99,116,46,100,101,102,105,110,101,80,
+114,111,112,101,114,116,121,40,111,98,106,101,99,116,44,32,110,97,109,101,
+44,32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,118,97,108,117,101,58,32,
+118,97,108,117,101,44,10,32,32,32,32,32,32,32,32,32,32,32,32,119,114,105,
+116,97,98,108,101,58,32,116,114,117,101,44,10,32,32,32,32,32,32,32,32,32,
+32,32,32,101,110,117,109,101,114,97,98,108,101,58,32,102,97,108,115,101,44,
+10,32,32,32,32,32,32,32,32,32,32,32,32,99,111,110,102,105,103,117,114,97,
+98,108,101,58,32,116,114,117,101,10,32,32,32,32,32,32,32,32,125,41,59,10,
+32,32,32,32,125,10,10,32,32,32,32,102,117,110,99,116,105,111,110,32,100,
+101,102,68,40,110,97,109,101,44,32,118,97,108,117,101,41,32,123,10,32,32,
+32,32,32,32,32,32,100,101,102,40,68,44,32,110,97,109,101,44,32,118,97,108,
+117,101,41,59,10,32,32,32,32,125,10,10,32,32,32,32,47,47,32,67,111,109,112,
+97,116,105,98,105,108,105,116,121,32,102,111,114,32,39,99,111,110,115,111,
+108,101,46,108,111,103,39,46,10,32,32,32,32,105,102,32,40,102,97,108,115,
+101,41,32,123,10,32,32,32,32,32,32,32,32,99,111,110,115,111,108,101,32,61,
+32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,108,111,103,58,32,102,117,
+110,99,116,105,111,110,40,41,32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,112,114,105,110,116,40,65,114,114,97,121,46,112,114,111,116,
+111,116,121,112,101,46,106,111,105,110,46,99,97,108,108,40,97,114,103,117,
+109,101,110,116,115,44,32,39,32,39,41,41,59,10,32,32,32,32,32,32,32,32,32,
+32,32,32,125,10,32,32,32,32,32,32,32,32,125,59,10,32,32,32,32,125,10,10,32,
+32,32,32,47,47,32,68,117,107,116,97,112,101,46,108,105,110,101,40,41,32,
+119,97,115,32,114,101,109,111,118,101,100,32,105,110,32,68,117,107,116,97,
+112,101,32,48,46,49,49,46,48,44,32,104,101,114,101,39,115,32,97,110,32,101,
+120,97,109,112,108,101,10,32,32,32,32,47,47,32,114,101,112,108,97,99,101,
+109,101,110,116,32,117,115,101,114,32,99,111,100,101,32,99,111,117,108,100,
+32,117,115,101,46,10,32,32,32,32,105,102,32,40,102,97,108,115,101,41,32,
+123,10,32,32,32,32,32,32,32,32,100,101,102,40,68,44,32,39,108,105,110,101,
+39,44,32,102,117,110,99,116,105,111,110,32,40,41,32,123,10,32,32,32,32,32,
+32,32,32,32,32,32,32,39,117,115,101,32,100,117,107,32,110,111,116,97,105,
+108,39,59,10,10,32,32,32,32,32,32,32,32,32,32,32,32,47,42,32,84,97,105,108,
+32,99,97,108,108,115,32,97,114,101,32,112,114,101,118,101,110,116,101,100,
+32,116,111,32,101,110,115,117,114,101,32,99,97,108,108,105,110,103,32,97,
+99,116,105,118,97,116,105,111,110,32,101,120,105,115,116,115,46,10,32,32,
+32,32,32,32,32,32,32,32,32,32,32,42,32,67,97,108,108,32,115,116,97,99,107,
+32,105,110,100,105,99,101,115,58,32,45,49,32,61,32,68,117,107,116,97,112,
+101,46,97,99,116,44,32,45,50,32,61,32,103,101,116,67,117,114,114,101,110,
+116,76,105,110,101,44,32,45,51,32,61,32,99,97,108,108,101,114,10,32,32,32,
+32,32,32,32,32,32,32,32,32,32,42,47,10,10,32,32,32,32,32,32,32,32,32,32,32,
+32,114,101,116,117,114,110,32,40,68,117,107,116,97,112,101,46,97,99,116,40,
+45,51,41,32,124,124,32,123,125,41,46,108,105,110,101,78,117,109,98,101,114,
+59,10,32,32,32,32,32,32,32,32,125,41,59,10,32,32,32,32,125,10,10,32,32,32,
+32,47,47,32,76,111,103,103,101,114,32,111,98,106,101,99,116,32,102,111,114,
+32,67,32,99,111,100,101,32,112,114,111,118,105,100,101,100,32,98,121,32,
+105,110,105,116,32,99,111,100,101,32,110,111,119,46,10,32,32,32,32,105,102,
+32,40,116,114,117,101,41,32,123,10,32,32,32,32,32,32,32,32,100,101,102,40,
+68,46,76,111,103,103,101,114,44,32,39,99,108,111,103,39,44,32,110,101,119,
+32,68,46,76,111,103,103,101,114,40,39,67,39,41,41,59,10,32,32,32,32,125,10,
+10,32,32,32,32,47,47,32,84,114,97,99,107,105,110,103,32,116,97,98,108,101,
+32,102,111,114,32,67,111,109,109,111,110,74,83,32,109,111,100,117,108,101,
+32,108,111,97,100,105,110,103,46,10,32,32,32,32,105,102,32,40,116,114,117,
+101,41,32,123,10,32,32,32,32,32,32,32,32,100,101,102,40,68,44,32,39,109,
+111,100,76,111,97,100,101,100,39,44,32,123,125,41,59,10,32,32,32,32,125,10,
+125,41,40,116,104,105,115,44,32,68,117,107,116,97,112,101,41,59,10,0,
};
#endif /* DUK_USE_BUILTIN_INITJS */
#elif defined(DUK_USE_DOUBLE_ME)
@@ -12637,7 +13249,7 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[1952] = {
156,80,0,70,82,113,64,1,89,41,197,0,6,100,39,20,0,29,142,156,80,0,134,50,
98,243,21,53,121,136,160,144,0,22,26,120,24,73,197,0,9,96,167,20,0,41,128,
156,80,0,181,250,113,64,3,1,255,254,0,81,20,100,47,145,216,23,255,240,0,11,
-255,248,0,3,255,252,81,252,8,1,220,68,0,0,0,0,0,129,167,1,26,144,9,165,0,
+255,248,0,3,255,252,81,252,8,4,252,68,0,0,0,0,0,129,167,1,26,144,9,165,0,
26,177,199,197,132,30,147,16,120,86,65,217,80,240,232,164,120,114,80,60,52,
39,32,84,223,192,15,59,30,129,156,115,6,81,160,7,253,40,0,5,81,252,0,1,255,
78,0,84,113,96,128,0,209,69,128,21,87,240,0,7,253,72,1,81,221,66,0,3,69,
@@ -12669,16 +13281,90 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[1952] = {
106,0,
};
#ifdef DUK_USE_BUILTIN_INITJS
-DUK_INTERNAL const duk_uint8_t duk_initjs_data[187] = {
-40,102,117,110,99,116,105,111,110,40,100,44,97,41,123,102,117,110,99,116,
-105,111,110,32,98,40,97,44,98,44,99,41,123,79,98,106,101,99,116,46,100,101,
-102,105,110,101,80,114,111,112,101,114,116,121,40,97,44,98,44,123,118,97,
-108,117,101,58,99,44,119,114,105,116,97,98,108,101,58,33,48,44,101,110,117,
-109,101,114,97,98,108,101,58,33,49,44,99,111,110,102,105,103,117,114,97,98,
-108,101,58,33,48,125,41,125,98,40,97,46,76,111,103,103,101,114,44,34,99,
-108,111,103,34,44,110,101,119,32,97,46,76,111,103,103,101,114,40,34,67,34,
-41,41,59,98,40,97,44,34,109,111,100,76,111,97,100,101,100,34,44,123,125,41,
-125,41,40,116,104,105,115,44,68,117,107,116,97,112,101,41,59,10,0,
+DUK_INTERNAL const duk_uint8_t duk_initjs_data[1757] = {
+47,42,10,32,42,32,32,73,110,105,116,32,99,111,100,101,32,102,111,114,32,
+108,101,103,97,99,121,32,99,111,109,112,97,116,105,98,105,108,105,116,121,
+46,10,32,42,10,32,42,32,32,67,111,109,112,97,116,105,98,105,108,105,116,
+121,32,112,114,111,112,101,114,116,105,101,115,32,47,32,119,114,97,112,112,
+101,114,32,102,117,110,99,116,105,111,110,115,32,104,101,114,101,32,97,108,
+108,111,119,32,68,117,107,116,97,112,101,32,116,111,32,114,101,109,97,105,
+110,10,32,42,32,32,99,111,109,112,97,116,105,98,108,101,32,102,111,114,32,
+117,115,101,114,32,99,111,100,101,32,119,104,101,110,32,99,111,114,101,32,
+102,101,97,116,117,114,101,115,32,97,114,101,32,99,104,97,110,103,101,100,
+44,32,119,105,116,104,111,117,116,32,98,117,114,100,101,110,105,110,103,10,
+32,42,32,32,116,104,101,32,109,97,105,110,32,67,32,99,111,100,101,32,119,
+105,116,104,32,99,111,109,112,97,116,105,98,105,108,105,116,121,32,115,116,
+117,102,102,46,10,32,42,10,32,42,32,32,84,104,105,115,32,102,105,108,101,
+32,105,115,32,109,105,110,105,102,105,101,100,32,119,105,116,104,32,85,103,
+108,105,102,121,74,83,32,111,114,32,116,104,101,32,99,108,111,115,117,114,
+101,32,99,111,109,112,105,108,101,114,46,32,32,66,111,116,104,32,119,105,
+108,108,10,32,42,32,32,114,101,110,97,109,101,32,118,97,114,105,97,98,108,
+101,115,44,32,114,101,109,111,118,101,32,99,111,109,109,101,110,116,115,44,
+32,97,110,100,32,97,114,101,32,99,108,101,118,101,114,32,101,110,111,117,
+103,104,32,116,111,32,100,114,111,112,32,97,110,121,10,32,42,32,32,34,105,
+102,32,40,102,97,108,115,101,41,32,123,32,46,46,46,32,125,34,32,98,108,111,
+99,107,115,32,97,108,116,111,103,101,116,104,101,114,44,32,115,111,32,116,
+104,97,116,39,115,32,97,110,32,101,102,102,101,99,116,105,118,101,32,119,
+97,121,32,116,111,10,32,42,32,32,100,105,115,97,98,108,101,32,99,117,114,
+114,101,110,116,108,121,32,117,110,110,101,101,100,101,100,32,99,111,100,
+101,46,10,32,42,47,10,10,40,102,117,110,99,116,105,111,110,40,71,44,32,68,
+41,32,123,10,32,32,32,32,39,117,115,101,32,115,116,114,105,99,116,39,59,10,
+10,32,32,32,32,102,117,110,99,116,105,111,110,32,100,101,102,40,111,98,106,
+101,99,116,44,32,110,97,109,101,44,32,118,97,108,117,101,41,32,123,10,32,
+32,32,32,32,32,32,32,79,98,106,101,99,116,46,100,101,102,105,110,101,80,
+114,111,112,101,114,116,121,40,111,98,106,101,99,116,44,32,110,97,109,101,
+44,32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,118,97,108,117,101,58,32,
+118,97,108,117,101,44,10,32,32,32,32,32,32,32,32,32,32,32,32,119,114,105,
+116,97,98,108,101,58,32,116,114,117,101,44,10,32,32,32,32,32,32,32,32,32,
+32,32,32,101,110,117,109,101,114,97,98,108,101,58,32,102,97,108,115,101,44,
+10,32,32,32,32,32,32,32,32,32,32,32,32,99,111,110,102,105,103,117,114,97,
+98,108,101,58,32,116,114,117,101,10,32,32,32,32,32,32,32,32,125,41,59,10,
+32,32,32,32,125,10,10,32,32,32,32,102,117,110,99,116,105,111,110,32,100,
+101,102,68,40,110,97,109,101,44,32,118,97,108,117,101,41,32,123,10,32,32,
+32,32,32,32,32,32,100,101,102,40,68,44,32,110,97,109,101,44,32,118,97,108,
+117,101,41,59,10,32,32,32,32,125,10,10,32,32,32,32,47,47,32,67,111,109,112,
+97,116,105,98,105,108,105,116,121,32,102,111,114,32,39,99,111,110,115,111,
+108,101,46,108,111,103,39,46,10,32,32,32,32,105,102,32,40,102,97,108,115,
+101,41,32,123,10,32,32,32,32,32,32,32,32,99,111,110,115,111,108,101,32,61,
+32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,108,111,103,58,32,102,117,
+110,99,116,105,111,110,40,41,32,123,10,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,112,114,105,110,116,40,65,114,114,97,121,46,112,114,111,116,
+111,116,121,112,101,46,106,111,105,110,46,99,97,108,108,40,97,114,103,117,
+109,101,110,116,115,44,32,39,32,39,41,41,59,10,32,32,32,32,32,32,32,32,32,
+32,32,32,125,10,32,32,32,32,32,32,32,32,125,59,10,32,32,32,32,125,10,10,32,
+32,32,32,47,47,32,68,117,107,116,97,112,101,46,108,105,110,101,40,41,32,
+119,97,115,32,114,101,109,111,118,101,100,32,105,110,32,68,117,107,116,97,
+112,101,32,48,46,49,49,46,48,44,32,104,101,114,101,39,115,32,97,110,32,101,
+120,97,109,112,108,101,10,32,32,32,32,47,47,32,114,101,112,108,97,99,101,
+109,101,110,116,32,117,115,101,114,32,99,111,100,101,32,99,111,117,108,100,
+32,117,115,101,46,10,32,32,32,32,105,102,32,40,102,97,108,115,101,41,32,
+123,10,32,32,32,32,32,32,32,32,100,101,102,40,68,44,32,39,108,105,110,101,
+39,44,32,102,117,110,99,116,105,111,110,32,40,41,32,123,10,32,32,32,32,32,
+32,32,32,32,32,32,32,39,117,115,101,32,100,117,107,32,110,111,116,97,105,
+108,39,59,10,10,32,32,32,32,32,32,32,32,32,32,32,32,47,42,32,84,97,105,108,
+32,99,97,108,108,115,32,97,114,101,32,112,114,101,118,101,110,116,101,100,
+32,116,111,32,101,110,115,117,114,101,32,99,97,108,108,105,110,103,32,97,
+99,116,105,118,97,116,105,111,110,32,101,120,105,115,116,115,46,10,32,32,
+32,32,32,32,32,32,32,32,32,32,32,42,32,67,97,108,108,32,115,116,97,99,107,
+32,105,110,100,105,99,101,115,58,32,45,49,32,61,32,68,117,107,116,97,112,
+101,46,97,99,116,44,32,45,50,32,61,32,103,101,116,67,117,114,114,101,110,
+116,76,105,110,101,44,32,45,51,32,61,32,99,97,108,108,101,114,10,32,32,32,
+32,32,32,32,32,32,32,32,32,32,42,47,10,10,32,32,32,32,32,32,32,32,32,32,32,
+32,114,101,116,117,114,110,32,40,68,117,107,116,97,112,101,46,97,99,116,40,
+45,51,41,32,124,124,32,123,125,41,46,108,105,110,101,78,117,109,98,101,114,
+59,10,32,32,32,32,32,32,32,32,125,41,59,10,32,32,32,32,125,10,10,32,32,32,
+32,47,47,32,76,111,103,103,101,114,32,111,98,106,101,99,116,32,102,111,114,
+32,67,32,99,111,100,101,32,112,114,111,118,105,100,101,100,32,98,121,32,
+105,110,105,116,32,99,111,100,101,32,110,111,119,46,10,32,32,32,32,105,102,
+32,40,116,114,117,101,41,32,123,10,32,32,32,32,32,32,32,32,100,101,102,40,
+68,46,76,111,103,103,101,114,44,32,39,99,108,111,103,39,44,32,110,101,119,
+32,68,46,76,111,103,103,101,114,40,39,67,39,41,41,59,10,32,32,32,32,125,10,
+10,32,32,32,32,47,47,32,84,114,97,99,107,105,110,103,32,116,97,98,108,101,
+32,102,111,114,32,67,111,109,109,111,110,74,83,32,109,111,100,117,108,101,
+32,108,111,97,100,105,110,103,46,10,32,32,32,32,105,102,32,40,116,114,117,
+101,41,32,123,10,32,32,32,32,32,32,32,32,100,101,102,40,68,44,32,39,109,
+111,100,76,111,97,100,101,100,39,44,32,123,125,41,59,10,32,32,32,32,125,10,
+125,41,40,116,104,105,115,44,32,68,117,107,116,97,112,101,41,59,10,0,
};
#endif /* DUK_USE_BUILTIN_INITJS */
#else
@@ -13765,6 +14451,14 @@ DUK_INTERNAL void duk_unicode_case_convert_string(duk_hthread *thr, duk_small_in
*/
DUK_INTERNAL duk_codepoint_t duk_unicode_re_canonicalize_char(duk_hthread *thr, duk_codepoint_t cp) {
+#if 1 /* FIXME */
+ /* Fast canonicalization lookup at the cost of 128kB footprint. */
+ DUK_ASSERT(cp >= 0);
+ if (DUK_LIKELY(cp < 0x10000L)) {
+ return (duk_codepoint_t) duk_unicode_re_canon_lookup[cp];
+ }
+ return cp;
+#else
duk_codepoint_t y;
y = duk__case_transform_helper(thr,
@@ -13782,6 +14476,7 @@ DUK_INTERNAL duk_codepoint_t duk_unicode_re_canonicalize_char(duk_hthread *thr,
}
return y;
+#endif
}
/*
@@ -14185,8 +14880,8 @@ DUK_EXTERNAL void *duk_resize_buffer(duk_context *ctx, duk_idx_t index, duk_size
h = (duk_hbuffer_dynamic *) duk_require_hbuffer(ctx, index);
DUK_ASSERT(h != NULL);
- if (!DUK_HBUFFER_HAS_DYNAMIC(h)) {
- DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_BUFFER_NOT_DYNAMIC);
+ if (!(DUK_HBUFFER_HAS_DYNAMIC(h) && !DUK_HBUFFER_HAS_EXTERNAL(h))) {
+ DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_WRONG_BUFFER_TYPE);
}
/* maximum size check is handled by callee */
@@ -14206,8 +14901,8 @@ DUK_EXTERNAL void *duk_steal_buffer(duk_context *ctx, duk_idx_t index, duk_size_
h = (duk_hbuffer_dynamic *) duk_require_hbuffer(ctx, index);
DUK_ASSERT(h != NULL);
- if (!DUK_HBUFFER_HAS_DYNAMIC(h)) {
- DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_BUFFER_NOT_DYNAMIC);
+ if (!(DUK_HBUFFER_HAS_DYNAMIC(h) && !DUK_HBUFFER_HAS_EXTERNAL(h))) {
+ DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_WRONG_BUFFER_TYPE);
}
/* Forget the previous allocation, setting size to 0 and alloc to
@@ -14225,6 +14920,24 @@ DUK_EXTERNAL void *duk_steal_buffer(duk_context *ctx, duk_idx_t index, duk_size_
return ptr;
}
+
+DUK_EXTERNAL void duk_config_buffer(duk_context *ctx, duk_idx_t index, void *ptr, duk_size_t len) {
+ duk_hthread *thr = (duk_hthread *) ctx;
+ duk_hbuffer_external *h;
+
+ DUK_ASSERT(ctx != NULL);
+
+ h = (duk_hbuffer_external *) duk_require_hbuffer(ctx, index);
+ DUK_ASSERT(h != NULL);
+
+ if (!DUK_HBUFFER_HAS_EXTERNAL(h)) {
+ DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_WRONG_BUFFER_TYPE);
+ }
+ DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(h));
+
+ DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(thr->heap, h, ptr);
+ DUK_HBUFFER_EXTERNAL_SET_SIZE(h, len);
+}
#line 1 "duk_api_bytecode.c"
/*
* Bytecode dump/load
@@ -14608,7 +15321,7 @@ static duk_uint8_t *duk__load_func(duk_context *ctx, duk_uint8_t *p, duk_uint8_t
duk_uint8_t *fun_data;
duk_uint8_t *q;
duk_idx_t idx_base;
- duk_tval *tv;
+ duk_tval *tv1;
duk_uarridx_t arr_idx;
/* XXX: There's some overlap with duk_js_closure() here, but
@@ -14709,10 +15422,15 @@ static duk_uint8_t *duk__load_func(duk_context *ctx, duk_uint8_t *p, duk_uint8_t
break;
}
case DUK__SER_NUMBER: {
+ /* Important to do a fastint check so that constants are
+ * properly read back as fastints.
+ */
+ duk_tval tv_tmp;
duk_double_t val;
DUK__ASSERT_LEFT(8);
val = DUK_RAW_READ_DOUBLE_BE(p);
- duk_push_number(ctx, val);
+ DUK_TVAL_SET_NUMBER_CHKFAST(&tv_tmp, val);
+ duk_push_tval(ctx, &tv_tmp);
break;
}
default: {
@@ -14744,28 +15462,28 @@ static duk_uint8_t *duk__load_func(duk_context *ctx, duk_uint8_t *p, duk_uint8_t
DUK_HCOMPILEDFUNCTION_SET_DATA(thr->heap, h_fun, h_data);
DUK_HBUFFER_INCREF(thr, h_data);
- tv = duk_get_tval(ctx, idx_base + 2); /* may be NULL if no constants or inner funcs */
- DUK_ASSERT((count_const == 0 && count_funcs == 0) || tv != NULL);
+ tv1 = duk_get_tval(ctx, idx_base + 2); /* may be NULL if no constants or inner funcs */
+ DUK_ASSERT((count_const == 0 && count_funcs == 0) || tv1 != NULL);
q = fun_data;
if (count_const > 0) {
- /* Explicit zero size check to avoid NULL 'tv'. */
- DUK_MEMCPY((void *) q, (const void *) tv, sizeof(duk_tval) * count_const);
+ /* Explicit zero size check to avoid NULL 'tv1'. */
+ DUK_MEMCPY((void *) q, (const void *) tv1, sizeof(duk_tval) * count_const);
for (n = count_const; n > 0; n--) {
DUK_TVAL_INCREF_FAST(thr, (duk_tval *) (void *) q); /* no side effects */
q += sizeof(duk_tval);
}
- tv += count_const;
+ tv1 += count_const;
}
DUK_HCOMPILEDFUNCTION_SET_FUNCS(thr->heap, h_fun, (duk_hobject **) (void *) q);
for (n = count_funcs; n > 0; n--) {
duk_hobject *h_obj;
- DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv));
- h_obj = DUK_TVAL_GET_OBJECT(tv);
+ DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv1));
+ h_obj = DUK_TVAL_GET_OBJECT(tv1);
DUK_ASSERT(h_obj != NULL);
- tv++;
+ tv1++;
DUK_HOBJECT_INCREF(thr, h_obj);
*((duk_hobject **) (void *) q) = h_obj;
@@ -15346,6 +16064,7 @@ DUK_EXTERNAL void duk_new(duk_context *ctx, duk_idx_t nargs) {
*/
#ifdef DUK_USE_AUGMENT_ERROR_CREATE
+ duk_hthread_sync_currpc(thr);
duk_err_augment_error_create(thr, thr, NULL, 0, 1 /*noblame_fileline*/);
#endif
@@ -15357,6 +16076,34 @@ DUK_EXTERNAL void duk_new(duk_context *ctx, duk_idx_t nargs) {
DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_NOT_CONSTRUCTABLE);
}
+DUK_LOCAL duk_ret_t duk__pnew_helper(duk_context *ctx) {
+ duk_uint_t nargs;
+
+ nargs = duk_to_uint(ctx, -1);
+ duk_pop(ctx);
+
+ duk_new(ctx, nargs);
+ return 1;
+}
+
+DUK_EXTERNAL duk_int_t duk_pnew(duk_context *ctx, duk_idx_t nargs) {
+ duk_int_t rc;
+
+ DUK_ASSERT_CTX_VALID(ctx);
+
+ /* For now, just use duk_safe_call() to wrap duk_new(). We can't
+ * simply use a protected duk_handle_call() because there's post
+ * processing which might throw. It should be possible to ensure
+ * the post processing never throws (except in internal errors and
+ * out of memory etc which are always allowed) and then remove this
+ * wrapper.
+ */
+
+ duk_push_uint(ctx, nargs);
+ rc = duk_safe_call(ctx, duk__pnew_helper, nargs + 2 /*nargs*/, 1 /*nrets*/);
+ return rc;
+}
+
DUK_EXTERNAL duk_bool_t duk_is_constructor_call(duk_context *ctx) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_activation *act;
@@ -15893,10 +16640,12 @@ DUK_EXTERNAL duk_int_t duk_eval_raw(duk_context *ctx, const char *src_buffer, du
goto got_rc;
}
+ duk_push_global_object(ctx); /* explicit 'this' binding, see GH-164 */
+
if (flags & DUK_COMPILE_SAFE) {
- rc = duk_pcall(ctx, 0);
+ rc = duk_pcall_method(ctx, 0);
} else {
- duk_call(ctx, 0);
+ duk_call_method(ctx, 0);
rc = DUK_EXEC_SUCCESS;
}
@@ -16105,6 +16854,7 @@ DUK_EXTERNAL void duk_debugger_attach(duk_context *ctx,
heap->dbg_processing = 0;
heap->dbg_paused = 1;
heap->dbg_state_dirty = 1;
+ heap->dbg_force_restart = 0;
heap->dbg_step_type = 0;
heap->dbg_step_thread = NULL;
heap->dbg_step_csindex = 0;
@@ -16284,6 +17034,7 @@ DUK_EXTERNAL void duk_set_global_object(duk_context *ctx) {
*/
h_prev_glob = thr->builtins[DUK_BIDX_GLOBAL];
+ DUK_UNREF(h_prev_glob);
thr->builtins[DUK_BIDX_GLOBAL] = h_glob;
DUK_HOBJECT_INCREF(thr, h_glob);
DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_prev_glob); /* side effects, in theory (referenced by global env) */
@@ -17110,6 +17861,7 @@ DUK_EXTERNAL duk_int_t duk_api_global_line = 0;
* Helpers
*/
+/* Check that there's room to push one value. */
#if defined(DUK_USE_VALSTACK_UNSAFE)
/* Faster but value stack overruns are memory unsafe. */
#define DUK__CHECK_SPACE() do { \
@@ -17185,9 +17937,9 @@ DUK_LOCAL duk_int_t duk__api_coerce_d2i(duk_context *ctx, duk_idx_t index, duk_b
if (require) {
DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_NOT_NUMBER);
- } else {
- return 0;
+ /* not reachable */
}
+ return 0;
}
DUK_LOCAL duk_uint_t duk__api_coerce_d2ui(duk_context *ctx, duk_idx_t index, duk_bool_t require) {
@@ -17242,9 +17994,9 @@ DUK_LOCAL duk_uint_t duk__api_coerce_d2ui(duk_context *ctx, duk_idx_t index, duk
if (require) {
DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_NOT_NUMBER);
- } else {
- return 0;
+ /* not reachable */
}
+ return 0;
}
/*
@@ -17258,7 +18010,8 @@ DUK_LOCAL duk_uint_t duk__api_coerce_d2ui(duk_context *ctx, duk_idx_t index, duk
DUK_EXTERNAL duk_idx_t duk_normalize_index(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
- duk_idx_t vs_size;
+ duk_uidx_t vs_size;
+ duk_uidx_t uindex;
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT(DUK_INVALID_INDEX < 0);
@@ -17270,117 +18023,110 @@ DUK_EXTERNAL duk_idx_t duk_normalize_index(duk_context *ctx, duk_idx_t index) {
*/
/* Assume value stack sizes (in elements) fits into duk_idx_t. */
- vs_size = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
- DUK_ASSERT(vs_size >= 0);
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+ vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
+ DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
if (index < 0) {
- index = vs_size + index;
- if (DUK_UNLIKELY(index < 0)) {
- /* Also catches index == DUK_INVALID_INDEX: vs_size >= 0
- * so that vs_size + DUK_INVALID_INDEX cannot underflow
- * and will always be negative.
- */
- return DUK_INVALID_INDEX;
- }
+ uindex = vs_size + (duk_uidx_t) index;
} else {
/* since index non-negative */
DUK_ASSERT(index != DUK_INVALID_INDEX);
-
- if (DUK_UNLIKELY(index >= vs_size)) {
- return DUK_INVALID_INDEX;
- }
+ uindex = (duk_uidx_t) index;
}
- DUK_ASSERT(index >= 0);
- DUK_ASSERT(index < vs_size);
- return index;
+ /* DUK_INVALID_INDEX won't be accepted as a valid index. */
+ DUK_ASSERT(vs_size + (duk_uidx_t) DUK_INVALID_INDEX >= vs_size);
+
+ if (DUK_LIKELY(uindex < vs_size)) {
+ return (duk_idx_t) uindex;
+ }
+ return DUK_INVALID_INDEX;
}
DUK_EXTERNAL duk_idx_t duk_require_normalize_index(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
- duk_idx_t vs_size;
+ duk_uidx_t vs_size;
+ duk_uidx_t uindex;
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT(DUK_INVALID_INDEX < 0);
- vs_size = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
- DUK_ASSERT(vs_size >= 0);
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+ vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
+ DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
if (index < 0) {
- index = vs_size + index;
- if (DUK_UNLIKELY(index < 0)) {
- goto invalid_index;
- }
+ uindex = vs_size + (duk_uidx_t) index;
} else {
DUK_ASSERT(index != DUK_INVALID_INDEX);
- if (DUK_UNLIKELY(index >= vs_size)) {
- goto invalid_index;
- }
+ uindex = (duk_uidx_t) index;
}
- DUK_ASSERT(index >= 0);
- DUK_ASSERT(index < vs_size);
- return index;
+ /* DUK_INVALID_INDEX won't be accepted as a valid index. */
+ DUK_ASSERT(vs_size + (duk_uidx_t) DUK_INVALID_INDEX >= vs_size);
- invalid_index:
+ if (DUK_LIKELY(uindex < vs_size)) {
+ return (duk_idx_t) uindex;
+ }
DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_INVALID_INDEX);
return 0; /* unreachable */
}
DUK_INTERNAL duk_tval *duk_get_tval(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
- duk_idx_t vs_size;
+ duk_uidx_t vs_size;
+ duk_uidx_t uindex;
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT(DUK_INVALID_INDEX < 0);
- vs_size = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
- DUK_ASSERT(vs_size >= 0);
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+ vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
+ DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
if (index < 0) {
- index = vs_size + index;
- if (DUK_UNLIKELY(index < 0)) {
- return NULL;
- }
+ uindex = vs_size + (duk_uidx_t) index;
} else {
DUK_ASSERT(index != DUK_INVALID_INDEX);
- if (DUK_UNLIKELY(index >= vs_size)) {
- return NULL;
- }
+ uindex = (duk_uidx_t) index;
}
- DUK_ASSERT(index >= 0);
- DUK_ASSERT(index < vs_size);
- return thr->valstack_bottom + index;
+ /* DUK_INVALID_INDEX won't be accepted as a valid index. */
+ DUK_ASSERT(vs_size + (duk_uidx_t) DUK_INVALID_INDEX >= vs_size);
+
+ if (DUK_LIKELY(uindex < vs_size)) {
+ return thr->valstack_bottom + uindex;
+ }
+ return NULL;
}
DUK_INTERNAL duk_tval *duk_require_tval(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
- duk_idx_t vs_size;
+ duk_uidx_t vs_size;
+ duk_uidx_t uindex;
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT(DUK_INVALID_INDEX < 0);
- vs_size = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
- DUK_ASSERT(vs_size >= 0);
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+ vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
+ DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
+ /* Use unsigned arithmetic to optimize comparison. */
if (index < 0) {
- index = vs_size + index;
- if (DUK_UNLIKELY(index < 0)) {
- goto invalid_index;
- }
+ uindex = vs_size + (duk_uidx_t) index;
} else {
DUK_ASSERT(index != DUK_INVALID_INDEX);
- if (DUK_UNLIKELY(index >= vs_size)) {
- goto invalid_index;
- }
+ uindex = (duk_uidx_t) index;
}
- DUK_ASSERT(index >= 0);
- DUK_ASSERT(index < vs_size);
- return thr->valstack_bottom + index;
+ /* DUK_INVALID_INDEX won't be accepted as a valid index. */
+ DUK_ASSERT(vs_size + (duk_uidx_t) DUK_INVALID_INDEX >= vs_size);
- invalid_index:
+ if (DUK_LIKELY(uindex < vs_size)) {
+ return thr->valstack_bottom + uindex;
+ }
DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_INVALID_INDEX);
return NULL;
}
@@ -17417,91 +18163,98 @@ DUK_EXTERNAL duk_idx_t duk_get_top(duk_context *ctx) {
return (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
}
-/* set stack top within currently allocated range, but don't reallocate */
+/* Set stack top within currently allocated range, but don't reallocate.
+ * This is performance critical especially for call handling, so whenever
+ * changing, profile and look at generated code.
+ */
DUK_EXTERNAL void duk_set_top(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
- duk_idx_t vs_size;
- duk_idx_t vs_limit;
- duk_idx_t count;
- duk_tval tv_tmp;
+ duk_uidx_t vs_size;
+ duk_uidx_t vs_limit;
+ duk_uidx_t uindex;
duk_tval *tv;
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT(DUK_INVALID_INDEX < 0);
- vs_size = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
- vs_limit = (duk_idx_t) (thr->valstack_end - thr->valstack_bottom);
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+ DUK_ASSERT(thr->valstack_end >= thr->valstack_bottom);
+ vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
+ vs_limit = (duk_uidx_t) (thr->valstack_end - thr->valstack_bottom);
if (index < 0) {
/* Negative indices are always within allocated stack but
* must not go below zero index.
*/
- index = vs_size + index;
- if (index < 0) {
- /* Also catches index == DUK_INVALID_INDEX. */
- goto invalid_index;
- }
+ uindex = vs_size + (duk_uidx_t) index;
} else {
/* Positive index can be higher than valstack top but must
* not go above allocated stack (equality is OK).
*/
- if (index > vs_limit) {
- goto invalid_index;
- }
+ uindex = (duk_uidx_t) index;
}
- DUK_ASSERT(index >= 0);
- DUK_ASSERT(index <= vs_limit);
- if (index >= vs_size) {
- /* Stack size increases or stays the same. Fill the new
- * entries (if any) with undefined. No pointer stability
- * issues here so we can use a running pointer.
- */
+ /* DUK_INVALID_INDEX won't be accepted as a valid index. */
+ DUK_ASSERT(vs_size + (duk_uidx_t) DUK_INVALID_INDEX >= vs_size);
+ DUK_ASSERT(vs_size + (duk_uidx_t) DUK_INVALID_INDEX >= vs_limit);
- tv = thr->valstack_top;
- count = index - vs_size;
- DUK_ASSERT(count >= 0);
- while (count > 0) {
- /* no need to decref previous or new value */
+#if defined(DUK_USE_VALSTACK_UNSAFE)
+ DUK_ASSERT(uindex <= vs_limit);
+#else
+ if (DUK_UNLIKELY(uindex > vs_limit)) {
+ DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_INVALID_INDEX);
+ return;
+ }
+#endif
+ DUK_ASSERT(uindex <= vs_limit);
+
+ /* Handle change in value stack top. Respect value stack
+ * initialization policy: 'undefined' above top. Note that
+ * DECREF may cause a side effect that reallocates valstack,
+ * so must relookup after DECREF.
+ */
+
+ if (uindex >= vs_size) {
+ /* Stack size increases or stays the same. */
+#if defined(DUK_USE_ASSERTIONS)
+ duk_uidx_t count;
+
+ count = uindex - vs_size;
+ while (count != 0) {
count--;
- DUK_ASSERT(DUK_TVAL_IS_UNDEFINED_UNUSED(tv));
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv);
- tv++;
+ tv = thr->valstack_top + count;
+ DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv));
}
- thr->valstack_top = tv;
+#endif
+ thr->valstack_top = thr->valstack_bottom + uindex;
} else {
- /* Stack size decreases, DECREF entries which are above the
- * new top. Each DECREF potentially invalidates valstack
- * pointers, so don't hold on to pointers. The valstack top
- * must also be updated on every loop in case a GC is triggered.
- */
-
- /* XXX: Here it would be useful to have a DECREF macro which
- * doesn't need a NULL check, and does refzero queueing without
- * running the refzero algorithm. There would be no pointer
- * instability in this case, and code could be inlined. After
- * the loop, one call to refzero would be needed.
- */
+ /* Stack size decreases. */
+#if defined(DUK_USE_REFERENCE_COUNTING)
+ duk_uidx_t count;
- count = vs_size - index;
+ count = vs_size - uindex;
DUK_ASSERT(count > 0);
-
while (count > 0) {
count--;
- tv = --thr->valstack_top; /* tv -> value just before prev top value */
+ tv = --thr->valstack_top; /* tv -> value just before prev top value; must relookup */
DUK_ASSERT(tv >= thr->valstack_bottom);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
-
- /* XXX: fast primitive to set a bunch of values to UNDEFINED_UNUSED */
-
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
}
- }
- return;
+#else /* DUK_USE_REFERENCE_COUNTING */
+ duk_uidx_t count;
+ duk_tval *tv_end;
- invalid_index:
- DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_INVALID_INDEX);
+ count = vs_size - uindex;
+ tv = thr->valstack_top;
+ tv_end = tv - count;
+ DUK_ASSERT(tv > tv_end);
+ do {
+ tv--;
+ DUK_TVAL_SET_UNDEFINED(tv);
+ } while (tv != tv_end);
+ thr->valstack_top = tv_end;
+#endif /* DUK_USE_REFERENCE_COUNTING */
+ }
}
DUK_EXTERNAL duk_idx_t duk_get_top_index(duk_context *ctx) {
@@ -17567,8 +18320,8 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
duk_tval *old_valstack_post;
#endif
duk_tval *new_valstack;
- duk_tval *p;
duk_size_t new_alloc_size;
+ duk_tval *p;
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT(thr != NULL);
@@ -17591,7 +18344,7 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
*
* Note: cannot use a plain DUK_REALLOC() because a mark-and-sweep may
* invalidate the original thr->valstack base pointer inside the realloc
- * process. See doc/memory-management.txt.
+ * process. See doc/memory-management.rst.
*/
new_alloc_size = sizeof(duk_tval) * new_size;
@@ -17619,7 +18372,7 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
* because mark-and-sweep must adhere to a strict stack policy.
* In other words, logical bottom and top MUST NOT have changed.
* - All values above the top are unreachable but are initialized
- * to UNDEFINED_UNUSED, up to the post-realloc valstack_end.
+ * to UNDEFINED, up to the post-realloc valstack_end.
* - 'old_end_offset' must be computed after realloc to be correct.
*/
@@ -17633,6 +18386,9 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
#endif
thr->valstack = new_valstack;
thr->valstack_end = new_valstack + new_size;
+#if !defined(DUK_USE_PREFER_SIZE)
+ thr->valstack_size = new_size;
+#endif
thr->valstack_bottom = (duk_tval *) (void *) ((duk_uint8_t *) new_valstack + old_bottom_offset);
thr->valstack_top = (duk_tval *) (void *) ((duk_uint8_t *) new_valstack + old_top_offset);
@@ -17663,23 +18419,23 @@ DUK_LOCAL duk_bool_t duk__resize_valstack(duk_context *ctx, duk_size_t new_size)
(void *) thr->valstack, (void *) thr->valstack_end,
(void *) thr->valstack_bottom, (void *) thr->valstack_top));
- /* init newly allocated slots (only) */
+ /* Init newly allocated slots (only). */
p = (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + old_end_offset_post);
while (p < thr->valstack_end) {
- /* never executed if new size is smaller */
- DUK_TVAL_SET_UNDEFINED_UNUSED(p);
+ /* Never executed if new size is smaller. */
+ DUK_TVAL_SET_UNDEFINED(p);
p++;
}
- /* assertion check: we maintain elements above top in known state */
-#ifdef DUK_USE_ASSERTIONS
+ /* Assert for value stack initialization policy. */
+#if defined(DUK_USE_ASSERTIONS)
p = thr->valstack_top;
while (p < thr->valstack_end) {
- /* everything above old valstack top should be preinitialized now */
- DUK_ASSERT(DUK_TVAL_IS_UNDEFINED_UNUSED(p));
+ DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(p));
p++;
}
#endif
+
return 1;
}
@@ -17709,7 +18465,12 @@ duk_bool_t duk_valstack_resize_raw(duk_context *ctx,
DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
DUK_ASSERT(thr->valstack_end >= thr->valstack_top);
+#if defined(DUK_USE_PREFER_SIZE)
old_size = (duk_size_t) (thr->valstack_end - thr->valstack);
+#else
+ DUK_ASSERT((duk_size_t) (thr->valstack_end - thr->valstack) == thr->valstack_size);
+ old_size = thr->valstack_size;
+#endif
if (min_new_size <= old_size) {
is_shrink = 1;
@@ -17983,10 +18744,9 @@ DUK_EXTERNAL void duk_replace(duk_context *ctx, duk_idx_t to_index) {
/* For tv1 == tv2, both pointing to stack top, the end result
* is same as duk_pop(ctx).
*/
-
DUK_TVAL_SET_TVAL(&tv_tmp, tv2);
DUK_TVAL_SET_TVAL(tv2, tv1);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv1);
+ DUK_TVAL_SET_UNDEFINED(tv1);
thr->valstack_top--;
DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
}
@@ -17995,7 +18755,6 @@ DUK_EXTERNAL void duk_copy(duk_context *ctx, duk_idx_t from_index, duk_idx_t to_
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv1;
duk_tval *tv2;
- duk_tval tv_tmp;
DUK_ASSERT_CTX_VALID(ctx);
DUK_UNREF(thr); /* w/o refcounting */
@@ -18006,11 +18765,7 @@ DUK_EXTERNAL void duk_copy(duk_context *ctx, duk_idx_t from_index, duk_idx_t to_
DUK_ASSERT(tv2 != NULL);
/* For tv1 == tv2, this is a no-op (no explicit check needed). */
-
- DUK_TVAL_SET_TVAL(&tv_tmp, tv2);
- DUK_TVAL_SET_TVAL(tv2, tv1);
- DUK_TVAL_INCREF(thr, tv2); /* no side effects */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv2, tv1); /* side effects */
}
DUK_EXTERNAL void duk_remove(duk_context *ctx, duk_idx_t index) {
@@ -18045,7 +18800,7 @@ DUK_EXTERNAL void duk_remove(duk_context *ctx, duk_idx_t index) {
nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p)); /* Note: 'q' is top-1 */
DUK_MEMMOVE(p, p + 1, nbytes); /* zero size not an issue: pointers are valid */
- DUK_TVAL_SET_UNDEFINED_UNUSED(q);
+ DUK_TVAL_SET_UNDEFINED(q);
thr->valstack_top--;
#ifdef DUK_USE_REFERENCE_COUNTING
@@ -18106,24 +18861,22 @@ DUK_EXTERNAL void duk_xcopymove_raw(duk_context *to_ctx, duk_context *from_ctx,
to_thr->valstack_top = (duk_tval *) (void *) (((duk_uint8_t *) p) + nbytes);
if (is_copy) {
- /* incref copies, keep originals */
+ /* Incref copies, keep originals. */
q = to_thr->valstack_top;
while (p < q) {
DUK_TVAL_INCREF(to_thr, p); /* no side effects */
p++;
}
} else {
- /* no net refcount change */
+ /* No net refcount change. */
p = from_thr->valstack_top;
q = (duk_tval *) (void *) (((duk_uint8_t *) p) - nbytes);
from_thr->valstack_top = q;
- /* elements above stack top are kept UNUSED */
while (p > q) {
p--;
- DUK_TVAL_SET_UNDEFINED_UNUSED(p);
-
- /* XXX: fast primitive to set a bunch of values to UNDEFINED_UNUSED */
+ DUK_TVAL_SET_UNDEFINED(p);
+ /* XXX: fast primitive to set a bunch of values to UNDEFINED */
}
}
}
@@ -18790,6 +19543,7 @@ DUK_EXTERNAL duk_size_t duk_get_length(duk_context *ctx, duk_idx_t index) {
#endif
default:
/* number */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
return 0;
}
@@ -18880,31 +19634,25 @@ DUK_EXTERNAL void duk_to_defaultvalue(duk_context *ctx, duk_idx_t index, duk_int
DUK_EXTERNAL void duk_to_undefined(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
DUK_ASSERT_CTX_VALID(ctx);
DUK_UNREF(thr);
tv = duk_require_tval(ctx, index);
DUK_ASSERT(tv != NULL);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
}
DUK_EXTERNAL void duk_to_null(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
DUK_ASSERT_CTX_VALID(ctx);
DUK_UNREF(thr);
tv = duk_require_tval(ctx, index);
DUK_ASSERT(tv != NULL);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_NULL(tv); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NULL_UPDREF(thr, tv); /* side effects */
}
/* E5 Section 9.1 */
@@ -18926,7 +19674,6 @@ DUK_EXTERNAL void duk_to_primitive(duk_context *ctx, duk_idx_t index, duk_int_t
DUK_EXTERNAL duk_bool_t duk_to_boolean(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
duk_bool_t val;
DUK_ASSERT_CTX_VALID(ctx);
@@ -18942,16 +19689,13 @@ DUK_EXTERNAL duk_bool_t duk_to_boolean(duk_context *ctx, duk_idx_t index) {
/* Note: no need to re-lookup tv, conversion is side effect free */
DUK_ASSERT(tv != NULL);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_BOOLEAN(tv, val); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv, val); /* side effects */
return val;
}
DUK_EXTERNAL duk_double_t duk_to_number(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
duk_double_t d;
DUK_ASSERT_CTX_VALID(ctx);
@@ -18963,9 +19707,7 @@ DUK_EXTERNAL duk_double_t duk_to_number(duk_context *ctx, duk_idx_t index) {
/* Note: need to re-lookup because ToNumber() may have side effects */
tv = duk_require_tval(ctx, index);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_NUMBER(tv, d); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, d); /* side effects */
return d;
}
@@ -18978,7 +19720,6 @@ typedef duk_double_t (*duk__toint_coercer)(duk_hthread *thr, duk_tval *tv);
DUK_LOCAL duk_double_t duk__to_int_uint_helper(duk_context *ctx, duk_idx_t index, duk__toint_coercer coerce_func) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
duk_double_t d;
DUK_ASSERT_CTX_VALID(ctx);
@@ -18991,9 +19732,7 @@ DUK_LOCAL duk_double_t duk__to_int_uint_helper(duk_context *ctx, duk_idx_t index
/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
tv = duk_require_tval(ctx, index);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_NUMBER(tv, d); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, d); /* side effects */
return d;
}
@@ -19018,7 +19757,6 @@ DUK_EXTERNAL duk_uint_t duk_to_uint(duk_context *ctx, duk_idx_t index) {
DUK_EXTERNAL duk_int32_t duk_to_int32(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
duk_int32_t ret;
DUK_ASSERT_CTX_VALID(ctx);
@@ -19030,14 +19768,10 @@ DUK_EXTERNAL duk_int32_t duk_to_int32(duk_context *ctx, duk_idx_t index) {
/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
tv = duk_require_tval(ctx, index);
#if defined(DUK_USE_FASTINT)
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_FASTINT_I32(tv, ret); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_I32_UPDREF(thr, tv, ret); /* side effects */
return ret;
#else
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_NUMBER(tv, (duk_double_t) ret); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, (duk_double_t) ret); /* side effects */
return ret;
#endif
}
@@ -19045,7 +19779,6 @@ DUK_EXTERNAL duk_int32_t duk_to_int32(duk_context *ctx, duk_idx_t index) {
DUK_EXTERNAL duk_uint32_t duk_to_uint32(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
duk_uint32_t ret;
DUK_ASSERT_CTX_VALID(ctx);
@@ -19057,14 +19790,10 @@ DUK_EXTERNAL duk_uint32_t duk_to_uint32(duk_context *ctx, duk_idx_t index) {
/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
tv = duk_require_tval(ctx, index);
#if defined(DUK_USE_FASTINT)
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_FASTINT_U32(tv, ret); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_U32_UPDREF(thr, tv, ret); /* side effects */
return ret;
#else
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_NUMBER(tv, (duk_double_t) ret); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, (duk_double_t) ret); /* side effects */
#endif
return ret;
}
@@ -19072,7 +19801,6 @@ DUK_EXTERNAL duk_uint32_t duk_to_uint32(duk_context *ctx, duk_idx_t index) {
DUK_EXTERNAL duk_uint16_t duk_to_uint16(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv;
- duk_tval tv_tmp;
duk_uint16_t ret;
DUK_ASSERT_CTX_VALID(ctx);
@@ -19084,18 +19812,15 @@ DUK_EXTERNAL duk_uint16_t duk_to_uint16(duk_context *ctx, duk_idx_t index) {
/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
tv = duk_require_tval(ctx, index);
#if defined(DUK_USE_FASTINT)
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_FASTINT_U32(tv, ret); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_U32_UPDREF(thr, tv, ret); /* side effects */
return ret;
#else
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_NUMBER(tv, (duk_double_t) ret); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, (duk_double_t) ret); /* side effects */
#endif
return ret;
}
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Special coercion for Uint8ClampedArray. */
DUK_INTERNAL duk_uint8_t duk_to_uint8clamped(duk_context *ctx, duk_idx_t index) {
duk_double_t d;
@@ -19130,6 +19855,7 @@ DUK_INTERNAL duk_uint8_t duk_to_uint8clamped(duk_context *ctx, duk_idx_t index)
}
return ret;
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
DUK_EXTERNAL const char *duk_to_lstring(duk_context *ctx, duk_idx_t index, duk_size_t *out_len) {
DUK_ASSERT_CTX_VALID(ctx);
@@ -19171,11 +19897,21 @@ DUK_EXTERNAL const char *duk_safe_to_lstring(duk_context *ctx, duk_idx_t index,
;
}
DUK_ASSERT(duk_is_string(ctx, -1));
+ DUK_ASSERT(duk_get_string(ctx, -1) != NULL);
duk_replace(ctx, index);
- return duk_require_lstring(ctx, index, out_len);
+ return duk_get_lstring(ctx, index, out_len);
}
+#if defined(DUK_USE_DEBUGGER_SUPPORT) /* only needed by debugger for now */
+DUK_EXTERNAL duk_hstring *duk_safe_to_hstring(duk_context *ctx, duk_idx_t index) {
+ (void) duk_safe_to_string(ctx, index);
+ DUK_ASSERT(duk_is_string(ctx, index));
+ DUK_ASSERT(duk_get_hstring(ctx, index) != NULL);
+ return duk_get_hstring(ctx, index);
+}
+#endif
+
/* XXX: other variants like uint, u32 etc */
DUK_INTERNAL duk_int_t duk_to_int_clamped_raw(duk_context *ctx, duk_idx_t index, duk_int_t minval, duk_int_t maxval, duk_bool_t *out_clamped) {
duk_hthread *thr = (duk_hthread *) ctx;
@@ -19318,6 +20054,7 @@ DUK_EXTERNAL const char *duk_to_string(duk_context *ctx, duk_idx_t index) {
#endif
default: {
/* number */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
duk_push_tval(ctx, tv);
duk_numconv_stringify(ctx,
@@ -19358,7 +20095,9 @@ DUK_EXTERNAL void *duk_to_buffer_raw(duk_context *ctx, duk_idx_t index, duk_size
h_buf = duk_get_hbuffer(ctx, index);
if (h_buf != NULL) {
/* Buffer is kept as is, with the fixed/dynamic nature of the
- * buffer only changed if requested.
+ * buffer only changed if requested. An external buffer
+ * is converted into a non-external dynamic buffer in a
+ * duk_to_dynamic_buffer() call.
*/
duk_uint_t tmp;
@@ -19366,7 +20105,8 @@ DUK_EXTERNAL void *duk_to_buffer_raw(duk_context *ctx, duk_idx_t index, duk_size
src_size = DUK_HBUFFER_GET_SIZE(h_buf);
tmp = (DUK_HBUFFER_HAS_DYNAMIC(h_buf) ? DUK_BUF_MODE_DYNAMIC : DUK_BUF_MODE_FIXED);
- if (tmp == mode || mode == DUK_BUF_MODE_DONTCARE) {
+ if ((tmp == mode && !DUK_HBUFFER_HAS_EXTERNAL(h_buf)) ||
+ mode == DUK_BUF_MODE_DONTCARE) {
/* Note: src_data may be NULL if input is a zero-size
* dynamic buffer.
*/
@@ -19440,6 +20180,8 @@ DUK_EXTERNAL void *duk_to_pointer(duk_context *ctx, duk_idx_t index) {
#endif
default:
/* number */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
res = NULL;
break;
}
@@ -19497,11 +20239,11 @@ DUK_EXTERNAL void duk_to_object(duk_context *ctx, duk_idx_t index) {
h_val = DUK_TVAL_GET_BUFFER(tv);
DUK_ASSERT(h_val != NULL);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
- DUK_BIDX_BUFFER_PROTOTYPE);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
+ DUK_BIDX_BUFFER_PROTOTYPE);
DUK_ASSERT(h_bufobj != NULL);
DUK_ASSERT(DUK_HOBJECT_HAS_EXTENSIBLE((duk_hobject *) h_bufobj));
DUK_ASSERT(DUK_HOBJECT_IS_BUFFEROBJECT((duk_hobject *) h_bufobj));
@@ -19575,6 +20317,8 @@ DUK_EXTERNAL void duk_to_object(duk_context *ctx, duk_idx_t index) {
case DUK_TAG_FASTINT:
#endif
default: {
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_NUMBER);
proto = DUK_BIDX_NUMBER_PROTOTYPE;
@@ -19657,6 +20401,7 @@ DUK_EXTERNAL duk_int_t duk_get_type(duk_context *ctx, duk_idx_t index) {
#endif
default:
/* Note: number has no explicit tag (in 8-byte representation) */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
return DUK_TYPE_NUMBER;
}
@@ -19700,6 +20445,7 @@ DUK_EXTERNAL duk_uint_t duk_get_type_mask(duk_context *ctx, duk_idx_t index) {
#endif
default:
/* Note: number has no explicit tag (in 8-byte representation) */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
return DUK_TYPE_MASK_NUMBER;
}
@@ -19874,7 +20620,7 @@ DUK_EXTERNAL duk_bool_t duk_is_callable(duk_context *ctx, duk_idx_t index) {
return duk_is_function(ctx, index);
}
-DUK_EXTERNAL duk_bool_t duk_is_dynamic_buffer(duk_context *ctx, duk_idx_t index) {
+DUK_EXTERNAL duk_bool_t duk_is_fixed_buffer(duk_context *ctx, duk_idx_t index) {
duk_tval *tv;
DUK_ASSERT_CTX_VALID(ctx);
@@ -19883,12 +20629,12 @@ DUK_EXTERNAL duk_bool_t duk_is_dynamic_buffer(duk_context *ctx, duk_idx_t index)
if (tv && DUK_TVAL_IS_BUFFER(tv)) {
duk_hbuffer *h = DUK_TVAL_GET_BUFFER(tv);
DUK_ASSERT(h != NULL);
- return (DUK_HBUFFER_HAS_DYNAMIC(h) ? 1 : 0);
+ return (DUK_HBUFFER_HAS_DYNAMIC(h) ? 0 : 1);
}
return 0;
}
-DUK_EXTERNAL duk_bool_t duk_is_fixed_buffer(duk_context *ctx, duk_idx_t index) {
+DUK_EXTERNAL duk_bool_t duk_is_dynamic_buffer(duk_context *ctx, duk_idx_t index) {
duk_tval *tv;
DUK_ASSERT_CTX_VALID(ctx);
@@ -19897,16 +20643,23 @@ DUK_EXTERNAL duk_bool_t duk_is_fixed_buffer(duk_context *ctx, duk_idx_t index) {
if (tv && DUK_TVAL_IS_BUFFER(tv)) {
duk_hbuffer *h = DUK_TVAL_GET_BUFFER(tv);
DUK_ASSERT(h != NULL);
- return (DUK_HBUFFER_HAS_DYNAMIC(h) ? 0 : 1);
+ return (DUK_HBUFFER_HAS_DYNAMIC(h) && !DUK_HBUFFER_HAS_EXTERNAL(h) ? 1 : 0);
}
return 0;
}
-/* XXX: make macro in API */
-DUK_EXTERNAL duk_bool_t duk_is_primitive(duk_context *ctx, duk_idx_t index) {
+DUK_EXTERNAL duk_bool_t duk_is_external_buffer(duk_context *ctx, duk_idx_t index) {
+ duk_tval *tv;
+
DUK_ASSERT_CTX_VALID(ctx);
- return !duk_is_object(ctx, index);
+ tv = duk_get_tval(ctx, index);
+ if (tv && DUK_TVAL_IS_BUFFER(tv)) {
+ duk_hbuffer *h = DUK_TVAL_GET_BUFFER(tv);
+ DUK_ASSERT(h != NULL);
+ return (DUK_HBUFFER_HAS_DYNAMIC(h) && DUK_HBUFFER_HAS_EXTERNAL(h) ? 1 : 0);
+ }
+ return 0;
}
DUK_EXTERNAL duk_errcode_t duk_get_error_code(duk_context *ctx, duk_idx_t index) {
@@ -19968,29 +20721,18 @@ DUK_INTERNAL void duk_push_tval(duk_context *ctx, duk_tval *tv) {
DUK_TVAL_INCREF(thr, tv); /* no side effects */
}
-#if defined(DUK_USE_DEBUGGER_SUPPORT)
-/* Right now only needed by the debugger. */
-DUK_INTERNAL void duk_push_unused(duk_context *ctx) {
- duk_hthread *thr;
- duk_tval *tv_slot;
-
- DUK_ASSERT_CTX_VALID(ctx);
- thr = (duk_hthread *) ctx;
- DUK__CHECK_SPACE();
- tv_slot = thr->valstack_top++;
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv_slot);
-}
-#endif
-
DUK_EXTERNAL void duk_push_undefined(duk_context *ctx) {
duk_hthread *thr;
- duk_tval *tv_slot;
DUK_ASSERT_CTX_VALID(ctx);
thr = (duk_hthread *) ctx;
DUK__CHECK_SPACE();
- tv_slot = thr->valstack_top++;
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv_slot);
+
+ /* Because value stack init policy is 'undefined above top',
+ * we don't need to write, just assert.
+ */
+ thr->valstack_top++;
+ DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top - 1));
}
DUK_EXTERNAL void duk_push_null(duk_context *ctx) {
@@ -20263,46 +21005,39 @@ DUK_EXTERNAL void duk_push_pointer(duk_context *ctx, void *val) {
DUK_TVAL_SET_POINTER(tv_slot, val);
}
-#define DUK__PUSH_THIS_FLAG_CHECK_COERC (1 << 0)
-#define DUK__PUSH_THIS_FLAG_TO_OBJECT (1 << 1)
-#define DUK__PUSH_THIS_FLAG_TO_STRING (1 << 2)
-
-DUK_LOCAL void duk__push_this_helper(duk_context *ctx, duk_small_uint_t flags) {
- duk_hthread *thr = (duk_hthread *) ctx;
+DUK_LOCAL void duk__push_this_helper(duk_context *ctx, duk_small_uint_t check_object_coercible) {
+ duk_hthread *thr;
+ duk_tval *tv_slot;
- DUK_ASSERT(thr != NULL);
DUK_ASSERT_CTX_VALID(ctx);
DUK_ASSERT_DISABLE(thr->callstack_top >= 0); /* avoid warning (unsigned) */
+ thr = (duk_hthread *) ctx;
DUK_ASSERT(thr->callstack_top <= thr->callstack_size);
+ DUK__CHECK_SPACE();
- if (thr->callstack_top == 0) {
- if (flags & DUK__PUSH_THIS_FLAG_CHECK_COERC) {
+ DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top)); /* because of valstack init policy */
+ tv_slot = thr->valstack_top++;
+
+ if (DUK_UNLIKELY(thr->callstack_top == 0)) {
+ if (check_object_coercible) {
goto type_error;
}
- duk_push_undefined(ctx);
+ /* 'undefined' already on stack top */
} else {
- duk_tval tv_tmp;
duk_tval *tv;
/* 'this' binding is just before current activation's bottom */
DUK_ASSERT(thr->valstack_bottom > thr->valstack);
tv = thr->valstack_bottom - 1;
- if (flags & DUK__PUSH_THIS_FLAG_CHECK_COERC) {
- if (DUK_TVAL_IS_UNDEFINED(tv) || DUK_TVAL_IS_NULL(tv)) {
- goto type_error;
- }
+ if (check_object_coercible &&
+ (DUK_TVAL_IS_UNDEFINED(tv) || DUK_TVAL_IS_NULL(tv))) {
+ /* XXX: better macro for DUK_TVAL_IS_UNDEFINED_OR_NULL(tv) */
+ goto type_error;
}
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- duk_push_tval(ctx, &tv_tmp);
- }
-
- if (flags & DUK__PUSH_THIS_FLAG_TO_OBJECT) {
- duk_to_object(ctx, -1);
- } else if (flags & DUK__PUSH_THIS_FLAG_TO_STRING) {
- duk_to_string(ctx, -1);
+ DUK_TVAL_SET_TVAL(tv_slot, tv);
+ DUK_TVAL_INCREF(thr, tv);
}
-
return;
type_error:
@@ -20312,13 +21047,13 @@ DUK_LOCAL void duk__push_this_helper(duk_context *ctx, duk_small_uint_t flags) {
DUK_EXTERNAL void duk_push_this(duk_context *ctx) {
DUK_ASSERT_CTX_VALID(ctx);
- duk__push_this_helper(ctx, 0 /*flags*/);
+ duk__push_this_helper(ctx, 0 /*check_object_coercible*/);
}
DUK_INTERNAL void duk_push_this_check_object_coercible(duk_context *ctx) {
DUK_ASSERT_CTX_VALID(ctx);
- duk__push_this_helper(ctx, DUK__PUSH_THIS_FLAG_CHECK_COERC /*flags*/);
+ duk__push_this_helper(ctx, 1 /*check_object_coercible*/);
}
DUK_INTERNAL duk_hobject *duk_push_this_coercible_to_object(duk_context *ctx) {
@@ -20326,8 +21061,8 @@ DUK_INTERNAL duk_hobject *duk_push_this_coercible_to_object(duk_context *ctx) {
DUK_ASSERT_CTX_VALID(ctx);
- duk__push_this_helper(ctx, DUK__PUSH_THIS_FLAG_CHECK_COERC |
- DUK__PUSH_THIS_FLAG_TO_OBJECT /*flags*/);
+ duk__push_this_helper(ctx, 1 /*check_object_coercible*/);
+ duk_to_object(ctx, -1);
h = duk_get_hobject(ctx, -1);
DUK_ASSERT(h != NULL);
return h;
@@ -20338,8 +21073,8 @@ DUK_INTERNAL duk_hstring *duk_push_this_coercible_to_string(duk_context *ctx) {
DUK_ASSERT_CTX_VALID(ctx);
- duk__push_this_helper(ctx, DUK__PUSH_THIS_FLAG_CHECK_COERC |
- DUK__PUSH_THIS_FLAG_TO_STRING /*flags*/);
+ duk__push_this_helper(ctx, 1 /*check_object_coercible*/);
+ duk_to_string(ctx, -1);
h = duk_get_hstring(ctx, -1);
DUK_ASSERT(h != NULL);
return h;
@@ -20869,7 +21604,7 @@ DUK_EXTERNAL duk_idx_t duk_push_c_lightfunc(duk_context *ctx, duk_c_function fun
return 0; /* not reached */
}
-DUK_INTERNAL duk_hbufferobject *duk_push_bufferobject(duk_context *ctx, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx) {
+DUK_INTERNAL duk_hbufferobject *duk_push_bufferobject_raw(duk_context *ctx, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_hbufferobject *obj;
duk_tval *tv_slot;
@@ -20898,6 +21633,134 @@ DUK_INTERNAL duk_hbufferobject *duk_push_bufferobject(duk_context *ctx, duk_uint
return obj;
}
+/* XXX: There's quite a bit of overlap with buffer creation handling in
+ * duk_bi_buffer.c. Look for overlap and refactor.
+ */
+#define DUK__PACK_ARGS(classnum,protobidx,elemtype,elemshift,isview) \
+ (((classnum) << 24) | ((protobidx) << 16) | ((elemtype) << 8) | ((elemshift) << 4) | (isview))
+
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+static const duk_uint32_t duk__bufobj_flags_lookup[] = {
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_BUFFER, DUK_BIDX_BUFFER_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8, 0, 0), /* DUK_BUFOBJ_DUKTAPE_BUFFER */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_BUFFER, DUK_BIDX_NODEJS_BUFFER_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8, 0, 0), /* DUK_BUFOBJ_NODEJS_BUFFER */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_ARRAYBUFFER, DUK_BIDX_ARRAYBUFFER_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8, 0, 0), /* DUK_BUFOBJ_ARRAYBUFFER */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_DATAVIEW, DUK_BIDX_DATAVIEW_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8, 0, 1), /* DUK_BUFOBJ_DATAVIEW */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT8ARRAY, DUK_BIDX_INT8ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_INT8, 0, 1), /* DUK_BUFOBJ_INT8ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8ARRAY, DUK_BIDX_UINT8ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8, 0, 1), /* DUK_BUFOBJ_UINT8ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY, DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8CLAMPED, 0, 1), /* DUK_BUFOBJ_UINT8CLAMPEDARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT16ARRAY, DUK_BIDX_INT16ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_INT16, 1, 1), /* DUK_BUFOBJ_INT16ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT16ARRAY, DUK_BIDX_UINT16ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT16, 1, 1), /* DUK_BUFOBJ_UINT16ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT32ARRAY, DUK_BIDX_INT32ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_INT32, 2, 1), /* DUK_BUFOBJ_INT32ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT32ARRAY, DUK_BIDX_UINT32ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT32, 2, 1), /* DUK_BUFOBJ_UINT32ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_FLOAT32ARRAY, DUK_BIDX_FLOAT32ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_FLOAT32, 2, 1), /* DUK_BUFOBJ_FLOAT32ARRAY */
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_FLOAT64ARRAY, DUK_BIDX_FLOAT64ARRAY_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_FLOAT64, 3, 1) /* DUK_BUFOBJ_FLOAT64ARRAY */
+};
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+/* Only allow Duktape.Buffer when support disabled. */
+static const duk_uint32_t duk__bufobj_flags_lookup[] = {
+ DUK__PACK_ARGS(DUK_HOBJECT_CLASS_BUFFER, DUK_BIDX_BUFFER_PROTOTYPE, DUK_HBUFFEROBJECT_ELEM_UINT8, 0, 0) /* DUK_BUFOBJ_DUKTAPE_BUFFER */
+};
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#undef DUK__PACK_ARGS
+
+DUK_EXTERNAL void duk_push_buffer_object(duk_context *ctx, duk_idx_t idx_buffer, duk_size_t byte_offset, duk_size_t byte_length, duk_uint_t flags) {
+ duk_hthread *thr;
+ duk_hbufferobject *h_bufobj;
+ duk_hbuffer *h_val;
+ duk_uint32_t tmp;
+ duk_uint_t classnum;
+ duk_uint_t protobidx;
+ duk_uint_t lookupidx;
+ duk_uint_t uint_offset, uint_length, uint_added;
+
+ DUK_ASSERT_CTX_VALID(ctx);
+ thr = (duk_hthread *) ctx;
+ DUK_UNREF(thr);
+
+ /* The underlying types for offset/length in duk_hbufferobject is
+ * duk_uint_t; make sure argument values fit and that offset + length
+ * does not wrap.
+ */
+ uint_offset = (duk_uint_t) byte_offset;
+ uint_length = (duk_uint_t) byte_length;
+ if (sizeof(duk_size_t) != sizeof(duk_uint_t)) {
+ if ((duk_size_t) uint_offset != byte_offset || (duk_size_t) uint_length != byte_length) {
+ goto range_error;
+ }
+ }
+ uint_added = uint_offset + uint_length;
+ if (uint_added < uint_offset) {
+ goto range_error;
+ }
+ DUK_ASSERT(uint_added >= uint_offset && uint_added >= uint_length);
+
+ DUK_ASSERT_DISABLE(flags >= 0); /* flags is unsigned */
+ lookupidx = flags & 0x0f; /* 4 low bits */
+ if (lookupidx >= sizeof(duk__bufobj_flags_lookup) / sizeof(duk_uint32_t)) {
+ goto arg_error;
+ }
+ tmp = duk__bufobj_flags_lookup[lookupidx];
+ classnum = tmp >> 24;
+ protobidx = (tmp >> 16) & 0xff;
+
+ h_val = duk_require_hbuffer(ctx, idx_buffer);
+ DUK_ASSERT(h_val != NULL);
+
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(classnum),
+ protobidx);
+ DUK_ASSERT(h_bufobj != NULL);
+
+ h_bufobj->buf = h_val;
+ DUK_HBUFFER_INCREF(thr, h_val);
+ h_bufobj->offset = uint_offset;
+ h_bufobj->length = uint_length;
+ h_bufobj->shift = (tmp >> 4) & 0x0f;
+ h_bufobj->elem_type = (tmp >> 8) & 0xff;
+ h_bufobj->is_view = tmp & 0x0f;
+ DUK_ASSERT_HBUFFEROBJECT_VALID(h_bufobj);
+
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+ /* TypedArray views need an automatic ArrayBuffer which must be
+ * provided as .buffer property of the view. Just create a new
+ * ArrayBuffer sharing the same underlying buffer.
+ */
+ if (flags & DUK_BUFOBJ_CREATE_ARRBUF) {
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
+ DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
+
+ DUK_ASSERT(h_bufobj != NULL);
+
+ h_bufobj->buf = h_val;
+ DUK_HBUFFER_INCREF(thr, h_val);
+ h_bufobj->offset = uint_offset;
+ h_bufobj->length = uint_length;
+ DUK_ASSERT(h_bufobj->shift == 0);
+ h_bufobj->elem_type = DUK_HBUFFEROBJECT_ELEM_UINT8;
+ DUK_ASSERT(h_bufobj->is_view == 0);
+ DUK_ASSERT_HBUFFEROBJECT_VALID(h_bufobj);
+
+ duk_xdef_prop_stridx(ctx, -2, DUK_STRIDX_LC_BUFFER, DUK_PROPDESC_FLAGS_NONE);
+ duk_compact(ctx, -1);
+ }
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+
+ return;
+
+ range_error:
+ DUK_ERROR(thr, DUK_ERR_RANGE_ERROR, DUK_STR_INVALID_CALL_ARGS);
+ return; /* not reached */
+
+ arg_error:
+ DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_INVALID_CALL_ARGS);
+ return; /* not reached */
+}
+
DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_context *ctx, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, va_list ap) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_idx_t ret;
@@ -20988,6 +21851,7 @@ DUK_EXTERNAL void *duk_push_buffer_raw(duk_context *ctx, duk_size_t size, duk_sm
duk_hthread *thr = (duk_hthread *) ctx;
duk_tval *tv_slot;
duk_hbuffer *h;
+ void *buf_data;
DUK_ASSERT_CTX_VALID(ctx);
@@ -21001,7 +21865,7 @@ DUK_EXTERNAL void *duk_push_buffer_raw(duk_context *ctx, duk_size_t size, duk_sm
DUK_ERROR(thr, DUK_ERR_RANGE_ERROR, DUK_STR_BUFFER_TOO_LONG);
}
- h = duk_hbuffer_alloc(thr->heap, size, flags);
+ h = duk_hbuffer_alloc(thr->heap, size, flags, &buf_data);
if (!h) {
DUK_ERROR(thr, DUK_ERR_ALLOC_ERROR, DUK_STR_ALLOC_FAILED);
}
@@ -21011,7 +21875,7 @@ DUK_EXTERNAL void *duk_push_buffer_raw(duk_context *ctx, duk_size_t size, duk_sm
DUK_HBUFFER_INCREF(thr, h);
thr->valstack_top++;
- return DUK_HBUFFER_GET_DATA_PTR(thr->heap, h);
+ return (void *) buf_data;
}
DUK_EXTERNAL duk_idx_t duk_push_heapptr(duk_context *ctx, void *ptr) {
@@ -21098,16 +21962,17 @@ DUK_INTERNAL void duk_push_hobject_bidx(duk_context *ctx, duk_small_int_t builti
DUK_EXTERNAL void duk_pop_n(duk_context *ctx, duk_idx_t count) {
duk_hthread *thr = (duk_hthread *) ctx;
+ duk_tval *tv;
DUK_ASSERT_CTX_VALID(ctx);
- if (count < 0) {
+ if (DUK_UNLIKELY(count < 0)) {
DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_INVALID_COUNT);
return;
}
DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
- if ((duk_size_t) (thr->valstack_top - thr->valstack_bottom) < (duk_size_t) count) {
+ if (DUK_UNLIKELY((duk_size_t) (thr->valstack_top - thr->valstack_bottom) < (duk_size_t) count)) {
DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_POP_TOO_MANY);
}
@@ -21121,36 +21986,58 @@ DUK_EXTERNAL void duk_pop_n(duk_context *ctx, duk_idx_t count) {
* instability), inline code.
*/
-#ifdef DUK_USE_REFERENCE_COUNTING
- while (count > 0) {
- duk_tval tv_tmp;
- duk_tval *tv;
+ /* XXX: optimize loops */
+#if defined(DUK_USE_REFERENCE_COUNTING)
+ while (count > 0) {
+ count--;
tv = --thr->valstack_top; /* tv points to element just below prev top */
DUK_ASSERT(tv >= thr->valstack_bottom);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
- count--;
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
}
#else
+ tv = thr->valstack_top;
while (count > 0) {
- duk_tval *tv;
-
- tv = --thr->valstack_top;
- DUK_ASSERT(tv >= thr->valstack_bottom);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
count--;
+ tv--;
+ DUK_ASSERT(tv >= thr->valstack_bottom);
+ DUK_TVAL_SET_UNDEFINED(tv);
}
+ thr->valstack_top = tv;
#endif
DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
}
+/* Popping one element is called so often that when footprint is not an issue,
+ * compile a specialized function for it.
+ */
+#if defined(DUK_USE_PREFER_SIZE)
DUK_EXTERNAL void duk_pop(duk_context *ctx) {
DUK_ASSERT_CTX_VALID(ctx);
duk_pop_n(ctx, 1);
}
+#else
+DUK_EXTERNAL void duk_pop(duk_context *ctx) {
+ duk_hthread *thr = (duk_hthread *) ctx;
+ duk_tval *tv;
+ DUK_ASSERT_CTX_VALID(ctx);
+
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+ if (DUK_UNLIKELY(thr->valstack_top == thr->valstack_bottom)) {
+ DUK_ERROR(thr, DUK_ERR_API_ERROR, DUK_STR_POP_TOO_MANY);
+ }
+
+ tv = --thr->valstack_top; /* tv points to element just below prev top */
+ DUK_ASSERT(tv >= thr->valstack_bottom);
+#ifdef DUK_USE_REFERENCE_COUNTING
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
+#else
+ DUK_TVAL_SET_UNDEFINED(tv);
+#endif
+ DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+}
+#endif /* !DUK_USE_PREFER_SIZE */
DUK_EXTERNAL void duk_pop_2(duk_context *ctx) {
DUK_ASSERT_CTX_VALID(ctx);
@@ -21182,6 +22069,12 @@ DUK_EXTERNAL void duk_throw(duk_context *ctx) {
* just before an error is thrown.
*/
+ /* Sync so that augmentation sees up-to-date activations, NULL
+ * thr->ptr_curr_pc so that it's not used if side effects occur
+ * in augmentation or longjmp handling.
+ */
+ duk_hthread_sync_and_null_currpc(thr);
+
#if defined(DUK_USE_AUGMENT_ERROR_THROW)
DUK_DDD(DUK_DDDPRINT("THROW ERROR (API): %!dT (before throw augment)", (duk_tval *) duk_get_tval(ctx, -1)));
duk_err_augment_error_throw(thr);
@@ -21423,7 +22316,7 @@ DUK_LOCAL void duk__concat_and_join_helper(duk_context *ctx, duk_idx_t count_in,
h = duk_to_hstring(ctx, -((duk_idx_t) count) - 1);
DUK_ASSERT(h != NULL);
- /* A bit tricky overflow test, see doc/code-issues.txt. */
+ /* A bit tricky overflow test, see doc/code-issues.rst. */
t1 = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h);
t2 = (duk_size_t) (count - 1);
limit = (duk_size_t) DUK_HSTRING_MAX_BYTELEN;
@@ -23338,6 +24231,7 @@ DUK_INTERNAL duk_ret_t duk_bi_boolean_constructor(duk_context *ctx) {
* Misc helpers
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Map DUK_HBUFFEROBJECT_ELEM_xxx to duk_hobject class number.
* Sync with duk_hbufferobject.h and duk_hobject.h.
*/
@@ -23352,11 +24246,13 @@ static const duk_uint8_t duk__buffer_class_from_elemtype[9] = {
DUK_HOBJECT_CLASS_FLOAT32ARRAY,
DUK_HOBJECT_CLASS_FLOAT64ARRAY
};
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Map DUK_HBUFFEROBJECT_ELEM_xxx to prototype object built-in index.
* Sync with duk_hbufferobject.h.
*/
-static const duk_uint16_t duk__buffer_proto_from_elemtype[9] = {
+static const duk_uint8_t duk__buffer_proto_from_elemtype[9] = {
DUK_BIDX_UINT8ARRAY_PROTOTYPE,
DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE,
DUK_BIDX_INT8ARRAY_PROTOTYPE,
@@ -23367,8 +24263,10 @@ static const duk_uint16_t duk__buffer_proto_from_elemtype[9] = {
DUK_BIDX_FLOAT32ARRAY_PROTOTYPE,
DUK_BIDX_FLOAT64ARRAY_PROTOTYPE
};
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
-/* Map DUK_HBUFFEROBJECT_ELEM_xxx to byte size.
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+/* Map DUK__FLX_xxx to byte size.
*/
static const duk_uint8_t duk__buffer_nbytes_from_fldtype[6] = {
1, /* DUK__FLD_8BIT */
@@ -23378,7 +24276,9 @@ static const duk_uint8_t duk__buffer_nbytes_from_fldtype[6] = {
8, /* DUK__FLD_DOUBLE */
0 /* DUK__FLD_VARINT; not relevant here */
};
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Bitfield for each DUK_HBUFFEROBJECT_ELEM_xxx indicating which element types
* are compatible with a blind byte copy for the TypedArray set() method (also
* used for TypedArray constructor). Array index is target buffer elem type,
@@ -23424,7 +24324,9 @@ static duk_uint16_t duk__buffer_elemtype_copy_compatible[9] = {
/* xxx -> DUK_HBUFFEROBJECT_ELEM_FLOAT64 */
(1U << DUK_HBUFFEROBJECT_ELEM_FLOAT64)
};
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Shared helper. */
DUK_LOCAL duk_hbufferobject *duk__getrequire_bufobj_this(duk_context *ctx, duk_bool_t throw_flag) {
duk_hthread *thr;
@@ -23450,19 +24352,25 @@ DUK_LOCAL duk_hbufferobject *duk__getrequire_bufobj_this(duk_context *ctx, duk_b
}
return NULL;
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Check that 'this' is a duk_hbufferobject and return a pointer to it. */
DUK_LOCAL duk_hbufferobject *duk__get_bufobj_this(duk_context *ctx) {
return duk__getrequire_bufobj_this(ctx, 0);
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Check that 'this' is a duk_hbufferobject and return a pointer to it
* (NULL if not).
*/
DUK_LOCAL duk_hbufferobject *duk__require_bufobj_this(duk_context *ctx) {
return duk__getrequire_bufobj_this(ctx, 1);
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Check that value is a duk_hbufferobject and return a pointer to it. */
DUK_LOCAL duk_hbufferobject *duk__require_bufobj_value(duk_context *ctx, duk_idx_t index) {
duk_hthread *thr;
@@ -23486,7 +24394,9 @@ DUK_LOCAL duk_hbufferobject *duk__require_bufobj_value(duk_context *ctx, duk_idx
}
DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, DUK_STR_NOT_BUFFER);
+ return NULL; /* not reachable */
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
DUK_LOCAL void duk__set_bufobj_buffer(duk_context *ctx, duk_hbufferobject *h_bufobj, duk_hbuffer *h_val) {
duk_hthread *thr;
@@ -23509,6 +24419,7 @@ DUK_LOCAL void duk__set_bufobj_buffer(duk_context *ctx, duk_hbufferobject *h_buf
DUK_ASSERT_HBUFFEROBJECT_VALID(h_bufobj);
}
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_LOCAL duk_hbufferobject *duk__push_arraybuffer_with_length(duk_context *ctx, duk_uint_t len) {
duk_hbuffer *h_val;
duk_hbufferobject *h_bufobj;
@@ -23517,11 +24428,11 @@ DUK_LOCAL duk_hbufferobject *duk__push_arraybuffer_with_length(duk_context *ctx,
h_val = (duk_hbuffer *) duk_get_hbuffer(ctx, -1);
DUK_ASSERT(h_val != NULL);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
- DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
+ DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
DUK_ASSERT(h_bufobj != NULL);
duk__set_bufobj_buffer(ctx, h_bufobj, h_val);
@@ -23529,7 +24440,9 @@ DUK_LOCAL duk_hbufferobject *duk__push_arraybuffer_with_length(duk_context *ctx,
return h_bufobj;
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Shared offset/length coercion helper. */
DUK_LOCAL void duk__resolve_offset_opt_length(duk_context *ctx,
duk_hbufferobject *h_bufarg,
@@ -23589,7 +24502,9 @@ DUK_LOCAL void duk__resolve_offset_opt_length(duk_context *ctx,
fail_range:
duk_error(thr, DUK_ERR_RANGE_ERROR, DUK_STR_INVALID_CALL_ARGS);
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Shared lenient buffer length clamping helper. No negative indices, no
* element/byte shifting.
*/
@@ -23625,7 +24540,9 @@ DUK_LOCAL void duk__clamp_startend_nonegidx_noshift(duk_context *ctx,
*out_start_offset = start_offset;
*out_end_offset = end_offset;
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Shared lenient buffer length clamping helper. Indices are treated as
* element indices (though output values are byte offsets) which only
* really matters for TypedArray views as other buffer object have a zero
@@ -23691,6 +24608,7 @@ DUK_LOCAL void duk__clamp_startend_negidx_shifted(duk_context *ctx,
*out_start_offset = start_offset;
*out_end_offset = end_offset;
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Indexed read/write helpers (also used from outside this file)
@@ -23703,9 +24621,13 @@ DUK_INTERNAL void duk_hbufferobject_push_validated_read(duk_context *ctx, duk_hb
switch (h_bufobj->elem_type) {
case DUK_HBUFFEROBJECT_ELEM_UINT8:
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
case DUK_HBUFFEROBJECT_ELEM_UINT8CLAMPED:
+#endif
duk_push_uint(ctx, (duk_uint_t) du.uc[0]);
break;
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+ /* These are not needed when only Duktape.Buffer is supported. */
case DUK_HBUFFEROBJECT_ELEM_INT8:
duk_push_int(ctx, (duk_int_t) (duk_int8_t) du.uc[0]);
break;
@@ -23727,6 +24649,7 @@ DUK_INTERNAL void duk_hbufferobject_push_validated_read(duk_context *ctx, duk_hb
case DUK_HBUFFEROBJECT_ELEM_FLOAT64:
duk_push_number(ctx, (duk_double_t) du.d);
break;
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
default:
DUK_UNREACHABLE();
}
@@ -23747,6 +24670,8 @@ DUK_INTERNAL void duk_hbufferobject_validated_write(duk_context *ctx, duk_hbuffe
case DUK_HBUFFEROBJECT_ELEM_UINT8:
du.uc[0] = (duk_uint8_t) duk_to_uint32(ctx, -1);
break;
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+ /* These are not needed when only Duktape.Buffer is supported. */
case DUK_HBUFFEROBJECT_ELEM_UINT8CLAMPED:
du.uc[0] = (duk_uint8_t) duk_to_uint8clamped(ctx, -1);
break;
@@ -23771,6 +24696,7 @@ DUK_INTERNAL void duk_hbufferobject_validated_write(duk_context *ctx, duk_hbuffe
case DUK_HBUFFEROBJECT_ELEM_FLOAT64:
du.d = (duk_double_t) duk_to_number(ctx, -1);
break;
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
default:
DUK_UNREACHABLE();
}
@@ -23864,11 +24790,11 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_constructor(duk_context *ctx) {
h_val = duk_get_hbuffer(ctx, -1);
DUK_ASSERT(h_val != NULL);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
- DUK_BIDX_BUFFER_PROTOTYPE);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
+ DUK_BIDX_BUFFER_PROTOTYPE);
DUK_ASSERT(h_bufobj != NULL);
duk__set_bufobj_buffer(ctx, h_bufobj, h_val);
@@ -23884,6 +24810,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_constructor(duk_context *ctx) {
* Node.js Buffer: constructor
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_constructor(duk_context *ctx) {
/* Internal class is Object: Object.prototype.toString.call(new Buffer(0))
* prints "[object Object]".
@@ -23935,11 +24862,11 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_constructor(duk_context *ctx) {
h_buf = duk_get_hbuffer(ctx, -1);
DUK_ASSERT(h_buf != NULL);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
- DUK_BIDX_NODEJS_BUFFER_PROTOTYPE);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
+ DUK_BIDX_NODEJS_BUFFER_PROTOTYPE);
DUK_ASSERT(h_bufobj != NULL);
h_bufobj->buf = h_buf;
@@ -23952,11 +24879,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_constructor(duk_context *ctx) {
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_constructor(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* ArrayBuffer, DataView, and TypedArray constructors
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_constructor(duk_context *ctx) {
duk_hbufferobject *h_bufobj;
duk_hbuffer *h_val;
@@ -23986,11 +24920,11 @@ DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_constructor(duk_context *ctx) {
DUK_ASSERT(h_val != NULL);
}
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
- DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
+ DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
DUK_ASSERT(h_bufobj != NULL);
duk__set_bufobj_buffer(ctx, h_bufobj, h_val);
@@ -24001,12 +24935,20 @@ DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_constructor(duk_context *ctx) {
fail_length:
return DUK_RET_RANGE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_constructor(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+
/* Format of magic, bits:
* 0...1: elem size shift (0-3)
* 2...5: elem type (DUK_HBUFFEROBJECT_ELEM_xxx)
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_context *ctx) {
duk_hthread *thr;
duk_tval *tv;
@@ -24121,11 +25063,11 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_context *ctx) {
DUK_ASSERT(byte_offset + byte_length <= h_bufarg->length);
DUK_ASSERT((elem_length << shift) == byte_length);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
- proto_bidx);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
+ proto_bidx);
h_val = h_bufarg->buf;
if (h_val == NULL) {
return DUK_RET_TYPE_ERROR;
@@ -24220,11 +25162,11 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_context *ctx) {
DUK_ASSERT(h_val != NULL);
/* Push the resulting view object and attach the ArrayBuffer. */
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
- proto_bidx);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
+ proto_bidx);
h_bufobj->buf = h_val;
DUK_HBUFFER_INCREF(thr, h_val);
@@ -24344,7 +25286,14 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_context *ctx) {
fail_arguments:
return DUK_RET_RANGE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_context *ctx) {
duk_hbufferobject *h_bufarg;
duk_hbufferobject *h_bufobj;
@@ -24364,11 +25313,11 @@ DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_context *ctx) {
DUK_ASSERT(offset <= h_bufarg->length);
DUK_ASSERT(offset + length <= h_bufarg->length);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DATAVIEW),
- DUK_BIDX_DATAVIEW_PROTOTYPE);
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DATAVIEW),
+ DUK_BIDX_DATAVIEW_PROTOTYPE);
h_val = h_bufarg->buf;
if (h_val == NULL) {
@@ -24400,11 +25349,18 @@ DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_context *ctx) {
DUK_ASSERT_HBUFFEROBJECT_VALID(h_bufobj);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* ArrayBuffer.isView()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_isview(duk_context *ctx) {
duk_hobject *h_obj;
duk_bool_t ret = 0;
@@ -24416,11 +25372,18 @@ DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_isview(duk_context *ctx) {
duk_push_boolean(ctx, ret);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_isview(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer: toString([encoding], [start], [end])
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tostring(duk_context *ctx) {
duk_hthread *thr;
duk_hbufferobject *h_this;
@@ -24466,11 +25429,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tostring(duk_context *ctx) {
type_error:
return DUK_RET_TYPE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tostring(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Duktape.Buffer: toString(), valueOf()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_buffer_prototype_tostring_shared(duk_context *ctx) {
duk_hthread *thr;
duk_tval *tv;
@@ -24520,11 +25490,18 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_prototype_tostring_shared(duk_context *ctx)
type_error:
return DUK_RET_TYPE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_buffer_prototype_tostring_shared(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.prototype: toJSON()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_context *ctx) {
duk_hthread *thr;
duk_hbufferobject *h_this;
@@ -24562,6 +25539,12 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_context *ctx) {
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.prototype.equals()
@@ -24569,6 +25552,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_context *ctx) {
* Node.js Buffer.compare()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_buffer_compare_shared(duk_context *ctx) {
duk_hthread *thr;
duk_small_uint_t magic;
@@ -24617,11 +25601,18 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_compare_shared(duk_context *ctx) {
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_buffer_compare_shared(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.prototype.fill()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_fill(duk_context *ctx) {
duk_hthread *thr;
duk_hbufferobject *h_this;
@@ -24687,11 +25678,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_fill(duk_context *ctx) {
duk_push_this(ctx);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_fill(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.prototype.write(string, [offset], [length], [encoding])
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_write(duk_context *ctx) {
duk_hthread *thr;
duk_hbufferobject *h_this;
@@ -24731,11 +25729,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_write(duk_context *ctx) {
duk_push_uint(ctx, length);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_write(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.prototype.copy()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_context *ctx) {
duk_hthread *thr;
duk_hbufferobject *h_this;
@@ -24839,6 +25844,12 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_context *ctx) {
fail_bounds:
return DUK_RET_RANGE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* TypedArray.prototype.set()
@@ -24876,6 +25887,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_context *ctx) {
* See test-bi-typedarray-proto-set.js.
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_context *ctx) {
duk_hthread *thr;
duk_hbufferobject *h_this;
@@ -25034,7 +26046,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_context *ctx) {
(void *) p_dst_base, (long) dst_length));
if (p_src_base >= p_dst_base + dst_length || /* source starts after dest ends */
- p_src_base + src_length < p_dst_base) { /* source ends before dest starts */
+ p_src_base + src_length <= p_dst_base) { /* source ends before dest starts */
no_overlap = 1;
}
@@ -25128,6 +26140,12 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_context *ctx) {
return 0;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.prototype.slice([start], [end])
@@ -25147,6 +26165,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_context *ctx) {
* - TypedArray .subarray() arguments are element indices, not byte offsets
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_context *ctx) {
duk_hthread *thr;
duk_small_int_t magic;
@@ -25191,11 +26210,11 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_context *ctx) {
*/
res_class_num = DUK_HOBJECT_GET_CLASS_NUMBER((duk_hobject *) h_this);
- h_bufobj = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(res_class_num),
- DUK_BIDX_OBJECT_PROTOTYPE); /* replaced */
+ h_bufobj = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(res_class_num),
+ DUK_BIDX_OBJECT_PROTOTYPE); /* replaced */
DUK_ASSERT(h_bufobj != NULL);
res_proto = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) h_this); /* may be NULL */
DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, (duk_hobject *) h_bufobj, res_proto);
@@ -25258,11 +26277,18 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_context *ctx) {
DUK_ASSERT_HBUFFEROBJECT_VALID(h_bufobj);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.isEncoding()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_encoding(duk_context *ctx) {
const char *encoding;
@@ -25273,11 +26299,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_encoding(duk_context *ctx) {
duk_push_boolean(ctx, DUK_STRCMP(encoding, "utf8") == 0);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_encoding(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.isBuffer()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_buffer(duk_context *ctx) {
duk_hthread *thr;
duk_tval *tv;
@@ -25307,11 +26340,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_buffer(duk_context *ctx) {
duk_push_boolean(ctx, ret);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_buffer(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.byteLength()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_byte_length(duk_context *ctx) {
const char *str;
duk_size_t len;
@@ -25326,11 +26366,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_byte_length(duk_context *ctx) {
duk_push_size_t(ctx, len);
return 1;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_byte_length(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Node.js Buffer.concat()
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_context *ctx) {
duk_hthread *thr;
duk_hobject *h_arg;
@@ -25390,11 +26437,11 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_context *ctx) {
return DUK_RET_RANGE_ERROR;
}
- h_bufres = duk_push_bufferobject(ctx,
- DUK_HOBJECT_FLAG_EXTENSIBLE |
- DUK_HOBJECT_FLAG_BUFFEROBJECT |
- DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
- DUK_BIDX_NODEJS_BUFFER_PROTOTYPE);
+ h_bufres = duk_push_bufferobject_raw(ctx,
+ DUK_HOBJECT_FLAG_EXTENSIBLE |
+ DUK_HOBJECT_FLAG_BUFFEROBJECT |
+ DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BUFFER),
+ DUK_BIDX_NODEJS_BUFFER_PROTOTYPE);
DUK_ASSERT(h_bufres != NULL);
p = (duk_uint8_t *) duk_push_fixed_buffer(ctx, total_length);
@@ -25438,6 +26485,12 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_context *ctx) {
return 1; /* return h_bufres */
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
/*
* Shared readfield and writefield methods
@@ -25446,6 +26499,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_context *ctx) {
* types. All offsets are byte based so no offset shifting is needed.
*/
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* Format of magic, bits:
* 0...1: field type; 0=uint8, 1=uint16, 2=uint32, 3=float, 4=double, 5=unused, 6=unused, 7=unused
* 3: endianness: 0=little, 1=big
@@ -25715,7 +26769,14 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_context *ctx) {
return DUK_RET_RANGE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
/* XXX: split into separate functions for each field type? */
DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_context *ctx) {
duk_hthread *thr;
@@ -25986,6 +27047,12 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_context *ctx) {
}
return DUK_RET_RANGE_ERROR;
}
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ return DUK_RET_UNSUPPORTED_ERROR;
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
#undef DUK__FLD_8BIT
#undef DUK__FLD_16BIT
@@ -26374,7 +27441,7 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_context *ctx, const ch
* Note in particular that we must parse whatever toString(), toUTCString(),
* and toISOString() can produce; see E5.1 Section 15.9.4.2.
*
- * Returns 1 to allow tailcalling.
+ * Returns 1 to allow tail calling.
*
* There is much room for improvement here with respect to supporting
* alternative datetime formats. For instance, V8 parses '2012-01-01' as
@@ -26934,7 +28001,7 @@ DUK_LOCAL duk_double_t duk__push_this_get_timeval(duk_context *ctx, duk_small_ui
}
/* Set timeval to 'this' from dparts, push the new time value onto the
- * value stack and return 1 (caller can then tailcall us). Expects
+ * value stack and return 1 (caller can then tail call us). Expects
* the value stack to contain 'this' on the stack top.
*/
DUK_LOCAL duk_ret_t duk__set_this_timeval_from_dparts(duk_context *ctx, duk_double_t *dparts, duk_small_uint_t flags) {
@@ -26947,7 +28014,7 @@ DUK_LOCAL duk_ret_t duk__set_this_timeval_from_dparts(duk_context *ctx, duk_doub
duk_dup_top(ctx); /* -> [ ... this timeval_new timeval_new ] */
duk_put_prop_stridx(ctx, -3, DUK_STRIDX_INT_VALUE);
- /* stack top: new time value, return 1 to allow tailcalls */
+ /* stack top: new time value, return 1 to allow tail calls */
return 1;
}
@@ -27066,7 +28133,7 @@ DUK_LOCAL duk_ret_t duk__to_string_helper(duk_context *ctx, duk_small_uint_t fla
/* Helper for component getter calls: check 'this' binding, get the
* internal time value, split it into parts (either as UTC time or
* local time), push a specified component as a return value to the
- * value stack and return 1 (caller can then tailcall us).
+ * value stack and return 1 (caller can then tail call us).
*/
DUK_LOCAL duk_ret_t duk__get_part_helper(duk_context *ctx, duk_small_uint_t flags_and_idx) {
duk_double_t d;
@@ -27098,7 +28165,7 @@ DUK_LOCAL duk_ret_t duk__get_part_helper(duk_context *ctx, duk_small_uint_t flag
* local time), modify one or more components as specified, recompute
* the time value, set it as the internal value. Finally, push the
* new time value as a return value to the value stack and return 1
- * (caller can then tailcall us).
+ * (caller can then tail call us).
*/
DUK_LOCAL duk_ret_t duk__set_part_helper(duk_context *ctx, duk_small_uint_t flags_and_maxnargs) {
duk_double_t d;
@@ -28234,12 +29301,15 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_info(duk_context *ctx) {
case DUK_HTYPE_BUFFER: {
duk_hbuffer *h_buf = (duk_hbuffer *) h;
if (DUK_HBUFFER_HAS_DYNAMIC(h_buf)) {
- /* XXX: when alloc_size == 0, dynamic buf ptr may now be NULL, in which case
- * the second allocation does not exist.
- */
- duk_hbuffer_dynamic *h_dyn = (duk_hbuffer_dynamic *) h;
- duk_push_uint(ctx, (duk_uint_t) (sizeof(duk_hbuffer_dynamic)));
- duk_push_uint(ctx, (duk_uint_t) (DUK_HBUFFER_DYNAMIC_GET_SIZE(h_dyn)));
+ if (DUK_HBUFFER_HAS_EXTERNAL(h_buf)) {
+ duk_push_uint(ctx, (duk_uint_t) (sizeof(duk_hbuffer_external)));
+ } else {
+ /* When alloc_size == 0 the second allocation may not
+ * actually exist.
+ */
+ duk_push_uint(ctx, (duk_uint_t) (sizeof(duk_hbuffer_dynamic)));
+ }
+ duk_push_uint(ctx, (duk_uint_t) (DUK_HBUFFER_GET_SIZE(h_buf)));
} else {
duk_push_uint(ctx, (duk_uint_t) (sizeof(duk_hbuffer_fixed) + DUK_HBUFFER_GET_SIZE(h_buf) + 1));
}
@@ -28281,14 +29351,11 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_act(duk_context *ctx) {
duk_push_tval(ctx, &act->tv_func);
- pc = (duk_uint_fast32_t) act->pc;
- if (pc > 0) {
- /* Relevant PC is just before current one because PC is
- * post-incremented. This should match what error augment
- * code does.
- */
- pc--;
- }
+ /* Relevant PC is just before current one because PC is
+ * post-incremented. This should match what error augment
+ * code does.
+ */
+ pc = duk_hthread_get_act_prev_pc(thr, act);
duk_push_uint(ctx, (duk_uint_t) pc);
#if defined(DUK_USE_PC2LINE)
@@ -29863,6 +30930,8 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_print_helper(duk_context *ctx) {
duk_file *f_out;
#endif
+ DUK_UNREF(thr);
+
magic = duk_get_current_magic(ctx);
DUK_UNREF(magic);
@@ -29917,7 +30986,7 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_print_helper(duk_context *ctx) {
p += sz_str;
*p++ = (duk_uint8_t) (i == nargs - 1 ? DUK_ASC_LF : DUK_ASC_SPACE);
}
- DUK_ASSERT((const duk_uint8_t *) p == buf + sz_total);
+ DUK_ASSERT((const duk_uint8_t *) p == buf + sz_buf);
#endif /* DUK_USE_PREFER_SIZE */
} else {
buf = (const duk_uint8_t *) &nl;
@@ -30397,7 +31466,7 @@ DUK_LOCAL_DECL void duk__emit_2(duk_json_enc_ctx *js_ctx, duk_uint_fast8_t ch1,
DUK_LOCAL_DECL void duk__unemit_1(duk_json_enc_ctx *js_ctx);
#endif
DUK_LOCAL_DECL void duk__emit_hstring(duk_json_enc_ctx *js_ctx, duk_hstring *h);
-#if defined(DUK_USE_JX) || defined(DUK_USE_JC)
+#if defined(DUK_USE_FASTINT)
DUK_LOCAL_DECL void duk__emit_cstring(duk_json_enc_ctx *js_ctx, const char *p);
#endif
DUK_LOCAL_DECL void duk__emit_stridx(duk_json_enc_ctx *js_ctx, duk_small_uint_t stridx);
@@ -31367,7 +32436,7 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
#define DUK__EMIT_1(js_ctx,ch) duk__emit_1((js_ctx), (duk_uint_fast8_t) (ch))
#define DUK__EMIT_2(js_ctx,ch1,ch2) duk__emit_2((js_ctx), (duk_uint_fast8_t) (ch1), (duk_uint_fast8_t) (ch2))
#define DUK__EMIT_HSTR(js_ctx,h) duk__emit_hstring((js_ctx), (h))
-#if defined(DUK_USE_JX) || defined(DUK_USE_JC)
+#if defined(DUK_USE_FASTINT) || defined(DUK_USE_JX) || defined(DUK_USE_JC)
#define DUK__EMIT_CSTR(js_ctx,p) duk__emit_cstring((js_ctx), (p))
#endif
#define DUK__EMIT_STRIDX(js_ctx,i) duk__emit_stridx((js_ctx), (i))
@@ -31387,7 +32456,7 @@ DUK_LOCAL void duk__emit_hstring(duk_json_enc_ctx *js_ctx, duk_hstring *h) {
DUK_BW_WRITE_ENSURE_HSTRING(js_ctx->thr, &js_ctx->bw, h);
}
-#if defined(DUK_USE_JX) || defined(DUK_USE_JC)
+#if defined(DUK_USE_FASTINT) || defined(DUK_USE_JX) || defined(DUK_USE_JC)
DUK_LOCAL void duk__emit_cstring(duk_json_enc_ctx *js_ctx, const char *str) {
DUK_BW_WRITE_ENSURE_CSTRING(js_ctx->thr, &js_ctx->bw, str);
}
@@ -32356,6 +33425,8 @@ DUK_LOCAL void duk__enc_value2(duk_json_enc_ctx *js_ctx) {
#endif
default: {
/* number */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
/* XXX: A fast path for usual integers would be useful when
* fastint support is not enabled.
*/
@@ -32489,9 +33560,13 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
/* If object has a .toJSON() property, we can't be certain
* that it wouldn't mutate any value arbitrarily, so bail
* out of the fast path.
+ *
+ * If an object is a Proxy we also can't avoid side effects
+ * so abandon.
*/
- if (duk_hobject_hasprop_raw(js_ctx->thr, obj, DUK_HTHREAD_STRING_TO_JSON(js_ctx->thr))) {
- DUK_DD(DUK_DDPRINT("object has a .toJSON property, abort fast path"));
+ if (duk_hobject_hasprop_raw(js_ctx->thr, obj, DUK_HTHREAD_STRING_TO_JSON(js_ctx->thr)) ||
+ DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(obj)) {
+ DUK_DD(DUK_DDPRINT("object has a .toJSON property or object is a Proxy, abort fast path"));
goto abort_fastpath;
}
@@ -32598,7 +33673,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
tv_val = DUK_HOBJECT_A_GET_VALUE_PTR(js_ctx->thr->heap, obj, i);
- if (DUK_UNLIKELY(DUK_TVAL_IS_UNDEFINED_UNUSED(tv_val))) {
+ if (DUK_UNLIKELY(DUK_TVAL_IS_UNUSED(tv_val))) {
/* Gap in array; check for inherited property,
* bail out if one exists. This should be enough
* to support gappy arrays for all practical code.
@@ -32700,6 +33775,9 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
/* XXX: A fast path for usual integers would be useful when
* fastint support is not enabled.
*/
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
+
/* XXX: Stack discipline is annoying, could be changed in numconv. */
duk_push_tval((duk_context *) js_ctx->thr, tv);
duk__enc_double(js_ctx);
@@ -32780,7 +33858,7 @@ void duk_bi_json_parse_helper(duk_context *ctx,
#ifdef DUK_USE_EXPLICIT_NULL_INIT
/* nothing now */
#endif
- js_ctx->recursion_limit = DUK_JSON_DEC_RECURSION_LIMIT;
+ js_ctx->recursion_limit = DUK_USE_JSON_DEC_RECLIMIT;
DUK_ASSERT(js_ctx->recursion_depth == 0);
/* Flag handling currently assumes that flags are consistent. This is OK
@@ -33089,7 +34167,7 @@ void duk_bi_json_stringify_helper(duk_context *ctx,
* slow path has a much larger recursion limit which we'll use if
* necessary.
*/
- DUK_ASSERT(DUK_JSON_ENC_RECURSION_LIMIT >= DUK_JSON_ENC_LOOPARRAY);
+ DUK_ASSERT(DUK_USE_JSON_ENC_RECLIMIT >= DUK_JSON_ENC_LOOPARRAY);
js_ctx->recursion_limit = DUK_JSON_ENC_LOOPARRAY;
DUK_ASSERT(js_ctx->recursion_depth == 0);
@@ -33156,7 +34234,7 @@ void duk_bi_json_stringify_helper(duk_context *ctx,
/* [ ... buf loop (proplist) (gap) holder "" ] */
- js_ctx->recursion_limit = DUK_JSON_ENC_RECURSION_LIMIT;
+ js_ctx->recursion_limit = DUK_USE_JSON_ENC_RECLIMIT;
DUK_ASSERT(js_ctx->recursion_depth == 0);
undef = duk__enc_value1(js_ctx, idx_holder); /* [ ... holder key ] -> [ ... holder key val ] */
@@ -34681,7 +35759,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_prototype_to_locale_string(duk_context *ctx
return DUK_RET_TYPE_ERROR;
}
duk_dup(ctx, 0); /* -> [ O toString O ] */
- duk_call_method(ctx, 0); /* XXX: call method tailcall? */
+ duk_call_method(ctx, 0); /* XXX: call method tail call? */
return 1;
}
@@ -36440,7 +37518,6 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_constructor(duk_context *ctx) {
DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_context *ctx) {
duk_hthread *thr = (duk_hthread *) ctx;
duk_hthread *thr_resume;
- duk_tval tv_tmp;
duk_tval *tv;
duk_hobject *func;
duk_hobject *caller_func;
@@ -36555,17 +37632,11 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_context *ctx) {
/* lj value2: thread */
DUK_ASSERT(thr->valstack_bottom < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value2);
- DUK_TVAL_SET_TVAL(&thr->heap->lj.value2, &thr->valstack_bottom[0]);
- DUK_TVAL_INCREF(thr, &thr->heap->lj.value2);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value2, &thr->valstack_bottom[0]); /* side effects */
/* lj value1: value */
DUK_ASSERT(thr->valstack_bottom + 1 < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value1);
- DUK_TVAL_SET_TVAL(&thr->heap->lj.value1, &thr->valstack_bottom[1]);
- DUK_TVAL_INCREF(thr, &thr->heap->lj.value1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, &thr->valstack_bottom[1]); /* side effects */
thr->heap->lj.iserror = is_error;
@@ -36599,7 +37670,6 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_context *ctx) {
DUK_INTERNAL duk_ret_t duk_bi_thread_yield(duk_context *ctx) {
duk_hthread *thr = (duk_hthread *) ctx;
- duk_tval tv_tmp;
duk_hobject *caller_func;
duk_small_int_t is_error;
@@ -36682,10 +37752,7 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_yield(duk_context *ctx) {
/* lj value1: value */
DUK_ASSERT(thr->valstack_bottom < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value1);
- DUK_TVAL_SET_TVAL(&thr->heap->lj.value1, &thr->valstack_bottom[0]);
- DUK_TVAL_INCREF(thr, &thr->heap->lj.value1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, &thr->valstack_bottom[0]); /* side effects */
thr->heap->lj.iserror = is_error;
@@ -37422,7 +38489,7 @@ DUK_LOCAL void duk__print_hobject(duk__dprint_state *st, duk_hobject *h) {
/* leave out trailing 'unused' elements */
while (a_limit > 0) {
tv = DUK_HOBJECT_A_GET_VALUE_PTR(NULL, h, a_limit - 1);
- if (!DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
+ if (!DUK_TVAL_IS_UNUSED(tv)) {
break;
}
a_limit--;
@@ -37661,10 +38728,17 @@ DUK_LOCAL void duk__print_hbuffer(duk__dprint_state *st, duk_hbuffer *h) {
}
if (DUK_HBUFFER_HAS_DYNAMIC(h)) {
- duk_hbuffer_dynamic *g = (duk_hbuffer_dynamic *) h;
- duk_fb_sprintf(fb, "buffer:dynamic:%p:%ld",
- (void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(NULL, g),
- (long) DUK_HBUFFER_DYNAMIC_GET_SIZE(g));
+ if (DUK_HBUFFER_HAS_EXTERNAL(h)) {
+ duk_hbuffer_external *g = (duk_hbuffer_external *) h;
+ duk_fb_sprintf(fb, "buffer:external:%p:%ld",
+ (void *) DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(NULL, g),
+ (long) DUK_HBUFFER_EXTERNAL_GET_SIZE(g));
+ } else {
+ duk_hbuffer_dynamic *g = (duk_hbuffer_dynamic *) h;
+ duk_fb_sprintf(fb, "buffer:dynamic:%p:%ld",
+ (void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(NULL, g),
+ (long) DUK_HBUFFER_DYNAMIC_GET_SIZE(g));
+ }
} else {
duk_fb_sprintf(fb, "buffer:fixed:%ld", (long) DUK_HBUFFER_GET_SIZE(h));
}
@@ -37744,11 +38818,11 @@ DUK_LOCAL void duk__print_tval(duk__dprint_state *st, duk_tval *tv) {
}
switch (DUK_TVAL_GET_TAG(tv)) {
case DUK_TAG_UNDEFINED: {
- if (DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
- duk_fb_put_cstring(fb, "unused");
- } else {
- duk_fb_put_cstring(fb, "undefined");
- }
+ duk_fb_put_cstring(fb, "undefined");
+ break;
+ }
+ case DUK_TAG_UNUSED: {
+ duk_fb_put_cstring(fb, "unused");
break;
}
case DUK_TAG_NULL: {
@@ -37791,6 +38865,7 @@ DUK_LOCAL void duk__print_tval(duk__dprint_state *st, duk_tval *tv) {
#endif
default: {
/* IEEE double is approximately 16 decimal digits; print a couple extra */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
duk_fb_sprintf(fb, "%.18g", (double) DUK_TVAL_GET_NUMBER(tv));
break;
@@ -38113,6 +39188,7 @@ DUK_INTERNAL void duk_debug_do_detach(duk_heap *heap) {
heap->dbg_processing = 0;
heap->dbg_paused = 0;
heap->dbg_state_dirty = 0;
+ heap->dbg_force_restart = 0;
heap->dbg_step_type = 0;
heap->dbg_step_thread = NULL;
heap->dbg_step_csindex = 0;
@@ -38467,9 +39543,6 @@ DUK_INTERNAL void duk_debug_read_tval(duk_hthread *thr) {
len = duk__debug_read_uint16_raw(thr);
duk__debug_read_hbuffer_raw(thr, len);
break;
- case 0x15:
- duk_push_unused(ctx);
- break;
case 0x16:
duk_push_undefined(ctx);
break;
@@ -38508,6 +39581,7 @@ DUK_INTERNAL void duk_debug_read_tval(duk_hthread *thr) {
duk_push_heapptr(thr, (void *) h);
break;
}
+ case 0x15: /* unused: not accepted in inbound messages */
default:
goto fail;
}
@@ -38682,6 +39756,11 @@ DUK_INTERNAL void duk_debug_write_hstring(duk_hthread *thr, duk_hstring *h) {
(h != NULL ? (duk_size_t) DUK_HSTRING_GET_BYTELEN(h) : 0));
}
+DUK_LOCAL void duk__debug_write_hstring_safe_top(duk_hthread *thr) {
+ duk_context *ctx = (duk_context *) thr;
+ duk_debug_write_hstring(thr, duk_safe_to_hstring(ctx, -1));
+}
+
DUK_INTERNAL void duk_debug_write_buffer(duk_hthread *thr, const char *data, duk_size_t length) {
duk_debug_write_strbuf(thr, data, length, 0x13);
}
@@ -38752,8 +39831,10 @@ DUK_INTERNAL void duk_debug_write_tval(duk_hthread *thr, duk_tval *tv) {
switch (DUK_TVAL_GET_TAG(tv)) {
case DUK_TAG_UNDEFINED:
- duk_debug_write_byte(thr,
- DUK_TVAL_IS_UNDEFINED_UNUSED(tv) ? 0x15 : 0x16);
+ duk_debug_write_byte(thr, 0x16);
+ break;
+ case DUK_TAG_UNUSED:
+ duk_debug_write_byte(thr, 0x15);
break;
case DUK_TAG_NULL:
duk_debug_write_byte(thr, 0x17);
@@ -38789,6 +39870,7 @@ DUK_INTERNAL void duk_debug_write_tval(duk_hthread *thr, duk_tval *tv) {
#endif
default:
/* Numbers are normalized to big (network) endian. */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
du.d = DUK_TVAL_GET_NUMBER(tv);
DUK_DBLUNION_DOUBLE_HTON(&du);
@@ -38861,22 +39943,24 @@ DUK_INTERNAL duk_uint_fast32_t duk_debug_curr_line(duk_hthread *thr) {
duk_uint_fast32_t line;
duk_uint_fast32_t pc;
- if (thr->callstack_top == 0) {
+ act = duk_hthread_get_current_activation(thr); /* may be NULL */
+ if (act == NULL) {
return 0;
}
- act = thr->callstack + thr->callstack_top - 1;
- /* act->pc indicates the next instruction about to be executed. This
- * is usually correct, but for the 'debugger' statement it will be the
- * instruction after that.
+ /* We're conceptually between two opcodes; act->pc indicates the next
+ * instruction to be executed. This is usually the correct pc/line to
+ * indicate in Status. (For the 'debugger' statement this now reports
+ * the pc/line after the debugger statement because the debugger opcode
+ * has already been executed.)
*/
- pc = (duk_uint_fast32_t) act->pc;
+ pc = duk_hthread_get_act_curr_pc(thr, act);
/* XXX: this should be optimized to be a raw query and avoid valstack
* operations if possible.
*/
- duk_push_hobject(ctx, act->func);
+ duk_push_tval(ctx, &act->tv_func);
line = duk_hobject_pc2line_query(ctx, -1, pc);
duk_pop(ctx);
return line;
@@ -38897,20 +39981,62 @@ DUK_INTERNAL void duk_debug_send_status(duk_hthread *thr) {
duk_debug_write_int(thr, 0);
} else {
act = thr->callstack + thr->callstack_top - 1;
- duk_push_hobject(ctx, act->func);
+ duk_push_tval(ctx, &act->tv_func);
duk_get_prop_string(ctx, -1, "fileName");
- duk_safe_to_string(ctx, -1);
- duk_debug_write_hstring(thr, duk_require_hstring(ctx, -1));
+ duk__debug_write_hstring_safe_top(thr);
duk_get_prop_string(ctx, -2, "name");
- duk_safe_to_string(ctx, -1);
- duk_debug_write_hstring(thr, duk_require_hstring(ctx, -1));
+ duk__debug_write_hstring_safe_top(thr);
duk_pop_3(ctx);
+ /* Report next pc/line to be executed. */
duk_debug_write_uint(thr, (duk_uint32_t) duk_debug_curr_line(thr));
- duk_debug_write_uint(thr, (duk_uint32_t) act->pc);
+ duk_debug_write_uint(thr, (duk_uint32_t) duk_hthread_get_act_curr_pc(thr, act));
+ }
+
+ duk_debug_write_eom(thr);
+}
+
+#if defined(DUK_USE_DEBUGGER_THROW_NOTIFY)
+DUK_INTERNAL void duk_debug_send_throw(duk_hthread *thr, duk_bool_t fatal) {
+ /*
+ * NFY <int: 5> <int: fatal> <str: msg> <str: filename> <int: linenumber> EOM
+ */
+
+ duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
+ duk_uint32_t pc;
+
+ DUK_ASSERT(thr->valstack_top > thr->valstack); /* At least: ... [err] */
+
+ duk_debug_write_notify(thr, DUK_DBG_CMD_THROW);
+ duk_debug_write_int(thr, fatal);
+
+ /* Report thrown value to client coerced to string */
+ duk_dup(ctx, -1);
+ duk__debug_write_hstring_safe_top(thr);
+ duk_pop(ctx);
+
+ if (duk_is_error(ctx, -1)) {
+ /* Error instance, use augmented error data directly */
+ duk_get_prop_stridx(ctx, -1, DUK_STRIDX_FILE_NAME);
+ duk__debug_write_hstring_safe_top(thr);
+ duk_get_prop_stridx(ctx, -2, DUK_STRIDX_LINE_NUMBER);
+ duk_debug_write_uint(thr, duk_get_uint(ctx, -1));
+ } else {
+ /* For anything other than an Error instance, we calculate the error
+ * location directly from the current activation.
+ */
+ act = thr->callstack + thr->callstack_top - 1;
+ duk_push_tval(ctx, &act->tv_func);
+ duk_get_prop_string(ctx, -1, "fileName");
+ duk__debug_write_hstring_safe_top(thr);
+ pc = duk_hthread_get_act_prev_pc(thr, act);
+ duk_debug_write_uint(thr, (duk_uint32_t) duk_hobject_pc2line_query(ctx, -2, pc));
}
+ duk_pop_2(ctx); /* shared pop */
duk_debug_write_eom(thr);
}
+#endif /* DUK_USE_DEBUGGER_THROW_NOTIFY */
/*
* Debug message processing
@@ -39004,7 +40130,7 @@ DUK_LOCAL void duk__debug_skip_to_eom(duk_hthread *thr) {
DUK_LOCAL void duk__debug_handle_basic_info(duk_hthread *thr, duk_heap *heap) {
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command version"));
+ DUK_D(DUK_DPRINT("debug command Version"));
duk_debug_write_reply(thr);
duk_debug_write_int(thr, DUK_VERSION);
@@ -39024,7 +40150,7 @@ DUK_LOCAL void duk__debug_handle_basic_info(duk_hthread *thr, duk_heap *heap) {
DUK_LOCAL void duk__debug_handle_trigger_status(duk_hthread *thr, duk_heap *heap) {
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command triggerstatus"));
+ DUK_D(DUK_DPRINT("debug command TriggerStatus"));
duk_debug_write_reply(thr);
duk_debug_write_eom(thr);
@@ -39032,7 +40158,7 @@ DUK_LOCAL void duk__debug_handle_trigger_status(duk_hthread *thr, duk_heap *heap
}
DUK_LOCAL void duk__debug_handle_pause(duk_hthread *thr, duk_heap *heap) {
- DUK_D(DUK_DPRINT("debug command pause"));
+ DUK_D(DUK_DPRINT("debug command Pause"));
DUK_HEAP_SET_PAUSED(heap);
duk_debug_write_reply(thr);
@@ -39040,7 +40166,7 @@ DUK_LOCAL void duk__debug_handle_pause(duk_hthread *thr, duk_heap *heap) {
}
DUK_LOCAL void duk__debug_handle_resume(duk_hthread *thr, duk_heap *heap) {
- DUK_D(DUK_DPRINT("debug command resume"));
+ DUK_D(DUK_DPRINT("debug command Resume"));
DUK_HEAP_CLEAR_PAUSED(heap);
duk_debug_write_reply(thr);
@@ -39060,7 +40186,7 @@ DUK_LOCAL void duk__debug_handle_step(duk_hthread *thr, duk_heap *heap, duk_int3
step_type = DUK_STEP_TYPE_OUT;
}
- DUK_D(DUK_DPRINT("debug command stepinto/stepover/stepout: %d", (int) cmd));
+ DUK_D(DUK_DPRINT("debug command StepInto/StepOver/StepOut: %d", (int) cmd));
line = duk_debug_curr_line(thr);
if (line > 0) {
heap->dbg_paused = 0;
@@ -39079,7 +40205,7 @@ DUK_LOCAL void duk__debug_handle_step(duk_hthread *thr, duk_heap *heap, duk_int3
DUK_LOCAL void duk__debug_handle_list_break(duk_hthread *thr, duk_heap *heap) {
duk_small_int_t i;
- DUK_D(DUK_DPRINT("debug command listbreak"));
+ DUK_D(DUK_DPRINT("debug command ListBreak"));
duk_debug_write_reply(thr);
for (i = 0; i < (duk_small_int_t) heap->dbg_breakpoint_count; i++) {
duk_debug_write_hstring(thr, heap->dbg_breakpoints[i].filename);
@@ -39098,7 +40224,7 @@ DUK_LOCAL void duk__debug_handle_add_break(duk_hthread *thr, duk_heap *heap) {
filename = duk_debug_read_hstring(thr);
linenumber = (duk_uint32_t) duk_debug_read_int(thr);
- DUK_D(DUK_DPRINT("debug command addbreak: %!O:%ld", (duk_hobject *) filename, (long) linenumber));
+ DUK_D(DUK_DPRINT("debug command AddBreak: %!O:%ld", (duk_hobject *) filename, (long) linenumber));
idx = duk_debug_add_breakpoint(thr, filename, linenumber);
if (idx >= 0) {
duk_debug_write_reply(thr);
@@ -39115,7 +40241,7 @@ DUK_LOCAL void duk__debug_handle_del_break(duk_hthread *thr, duk_heap *heap) {
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command delbreak"));
+ DUK_D(DUK_DPRINT("debug command DelBreak"));
idx = (duk_small_uint_t) duk_debug_read_int(thr);
if (duk_debug_remove_breakpoint(thr, idx)) {
duk_debug_write_reply(thr);
@@ -39131,7 +40257,7 @@ DUK_LOCAL void duk__debug_handle_get_var(duk_hthread *thr, duk_heap *heap) {
duk_bool_t rc;
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command getvar"));
+ DUK_D(DUK_DPRINT("debug command GetVar"));
str = duk_debug_read_hstring(thr); /* push to stack */
DUK_ASSERT(str != NULL);
@@ -39153,7 +40279,8 @@ DUK_LOCAL void duk__debug_handle_get_var(duk_hthread *thr, duk_heap *heap) {
duk_debug_write_reply(thr);
if (rc) {
duk_debug_write_int(thr, 1);
- duk_debug_write_tval(thr, duk_require_tval(ctx, -2));
+ DUK_ASSERT(duk_get_tval(ctx, -2) != NULL);
+ duk_debug_write_tval(thr, duk_get_tval(ctx, -2));
duk_pop_2(ctx);
} else {
duk_debug_write_int(thr, 0);
@@ -39169,12 +40296,13 @@ DUK_LOCAL void duk__debug_handle_put_var(duk_hthread *thr, duk_heap *heap) {
duk_tval *tv;
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command putvar"));
+ DUK_D(DUK_DPRINT("debug command PutVar"));
str = duk_debug_read_hstring(thr); /* push to stack */
DUK_ASSERT(str != NULL);
duk_debug_read_tval(thr); /* push to stack */
- tv = duk_require_tval(ctx, -1);
+ tv = duk_get_tval(ctx, -1);
+ DUK_ASSERT(tv != NULL);
if (thr->callstack_top > 0) {
duk_js_putvar_activation(thr,
@@ -39198,6 +40326,7 @@ DUK_LOCAL void duk__debug_handle_get_call_stack(duk_hthread *thr, duk_heap *heap
duk_context *ctx = (duk_context *) thr;
duk_hthread *curr_thr = thr;
duk_activation *curr_act;
+ duk_uint_fast32_t pc;
duk_uint_fast32_t line;
duk_size_t i;
@@ -39210,19 +40339,31 @@ DUK_LOCAL void duk__debug_handle_get_call_stack(duk_hthread *thr, duk_heap *heap
i--;
curr_act = curr_thr->callstack + i;
- /* XXX: optimize to use direct reads,
- * i.e. avoid value stack operations.
+ /* PC/line semantics here are:
+ * - For callstack top we're conceptually between two
+ * opcodes and current PC indicates next line to
+ * execute, so report that (matches Status).
+ * - For other activations we're conceptually still
+ * executing the instruction at PC-1, so report that
+ * (matches error stacktrace behavior).
+ * - See: https://github.com/svaarala/duktape/issues/281
+ */
+
+ /* XXX: optimize to use direct reads, i.e. avoid
+ * value stack operations.
*/
duk_push_tval(ctx, &curr_act->tv_func);
duk_get_prop_stridx(ctx, -1, DUK_STRIDX_FILE_NAME);
- duk_safe_to_string(ctx, -1);
- duk_debug_write_hstring(thr, duk_get_hstring(ctx, -1));
+ duk__debug_write_hstring_safe_top(thr);
duk_get_prop_stridx(ctx, -2, DUK_STRIDX_NAME);
- duk_safe_to_string(ctx, -1);
- duk_debug_write_hstring(thr, duk_get_hstring(ctx, -1));
- line = duk_hobject_pc2line_query(ctx, -3, curr_act->pc);
+ duk__debug_write_hstring_safe_top(thr);
+ pc = duk_hthread_get_act_curr_pc(thr, curr_act);
+ if (i != curr_thr->callstack_top - 1 && pc > 0) {
+ pc--;
+ }
+ line = duk_hobject_pc2line_query(ctx, -3, pc);
duk_debug_write_uint(thr, (duk_uint32_t) line);
- duk_debug_write_uint(thr, (duk_uint32_t) curr_act->pc);
+ duk_debug_write_uint(thr, (duk_uint32_t) pc);
duk_pop_3(ctx);
}
curr_thr = curr_thr->resumer;
@@ -39285,7 +40426,7 @@ DUK_LOCAL void duk__debug_handle_eval(duk_hthread *thr, duk_heap *heap) {
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command eval"));
+ DUK_D(DUK_DPRINT("debug command Eval"));
/* The eval code must be executed within the current (topmost)
* activation. For now, use global object eval() function, with
@@ -39309,7 +40450,7 @@ DUK_LOCAL void duk__debug_handle_eval(duk_hthread *thr, duk_heap *heap) {
act = thr->callstack + thr->callstack_top - 1;
fun = DUK_ACT_GET_FUNC(act);
- if (fun && DUK_HOBJECT_IS_COMPILEDFUNCTION(fun)) {
+ if (fun != NULL && DUK_HOBJECT_IS_COMPILEDFUNCTION(fun)) {
/* Direct eval requires that there's a current
* activation and it is an Ecmascript function.
* When Eval is executed from e.g. cooperate API
@@ -39337,7 +40478,8 @@ DUK_LOCAL void duk__debug_handle_eval(duk_hthread *thr, duk_heap *heap) {
duk_debug_write_reply(thr);
duk_debug_write_int(thr, (duk_int32_t) eval_err);
- duk_debug_write_tval(thr, duk_require_tval(ctx, -1));
+ DUK_ASSERT(duk_get_tval(ctx, -1) != NULL);
+ duk_debug_write_tval(thr, duk_get_tval(ctx, -1));
duk_debug_write_eom(thr);
duk_pop(ctx);
@@ -39346,7 +40488,7 @@ DUK_LOCAL void duk__debug_handle_eval(duk_hthread *thr, duk_heap *heap) {
DUK_LOCAL void duk__debug_handle_detach(duk_hthread *thr, duk_heap *heap) {
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command detach"));
+ DUK_D(DUK_DPRINT("debug command Detach"));
duk_debug_write_reply(thr);
duk_debug_write_eom(thr);
@@ -39507,7 +40649,7 @@ DUK_LOCAL void duk__debug_dump_strtab_probe(duk_hthread *thr, duk_heap *heap) {
#endif /* DUK_USE_STRTAB_PROBE */
DUK_LOCAL void duk__debug_handle_dump_heap(duk_hthread *thr, duk_heap *heap) {
- DUK_D(DUK_DPRINT("debug command dumpheap"));
+ DUK_D(DUK_DPRINT("debug command DumpHeap"));
duk_debug_write_reply(thr);
duk__debug_dump_heap_allocated(thr, heap);
@@ -39530,7 +40672,7 @@ DUK_LOCAL void duk__debug_handle_get_bytecode(duk_hthread *thr, duk_heap *heap)
DUK_UNREF(heap);
- DUK_D(DUK_DPRINT("debug command getbytecode"));
+ DUK_D(DUK_DPRINT("debug command GetBytecode"));
duk_debug_write_reply(thr);
if (thr->callstack_top == 0) {
@@ -39544,9 +40686,9 @@ DUK_LOCAL void duk__debug_handle_get_bytecode(duk_hthread *thr, duk_heap *heap)
}
DUK_ASSERT(fun == NULL || DUK_HOBJECT_IS_COMPILEDFUNCTION((duk_hobject *) fun));
- if (fun) {
+ if (fun != NULL) {
n = DUK_HCOMPILEDFUNCTION_GET_CONSTS_COUNT(heap, fun);
- duk_debug_write_int(thr, (int) n);
+ duk_debug_write_int(thr, (duk_int32_t) n);
tv = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(heap, fun);
for (i = 0; i < n; i++) {
duk_debug_write_tval(thr, tv);
@@ -39554,7 +40696,7 @@ DUK_LOCAL void duk__debug_handle_get_bytecode(duk_hthread *thr, duk_heap *heap)
}
n = DUK_HCOMPILEDFUNCTION_GET_FUNCS_COUNT(heap, fun);
- duk_debug_write_int(thr, (int) n);
+ duk_debug_write_int(thr, (duk_int32_t) n);
fn = DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(heap, fun);
for (i = 0; i < n; i++) {
duk_debug_write_hobject(thr, *fn);
@@ -39689,6 +40831,75 @@ DUK_LOCAL void duk__debug_process_message(duk_hthread *thr) {
return;
}
+/* Halt execution and enter a debugger message loop until execution is resumed
+ * by the client. PC for the current activation may be temporarily decremented
+ * so that the "current" instruction will be shown by the client. This helper
+ * is callable from anywhere, also outside bytecode executor.
+ */
+
+DUK_INTERNAL void duk_debug_halt_execution(duk_hthread *thr, duk_bool_t use_prev_pc) {
+ duk_activation *act;
+ duk_hcompiledfunction *fun;
+ duk_instr_t *old_pc = NULL;
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(thr->heap != NULL);
+ DUK_ASSERT(DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap));
+ DUK_ASSERT(thr->heap->dbg_processing == 0);
+
+ DUK_HEAP_SET_PAUSED(thr->heap);
+
+ act = duk_hthread_get_current_activation(thr);
+
+ /* NOTE: act may be NULL if an error is thrown outside of any activation,
+ * which may happen in the case of, e.g. syntax errors.
+ */
+
+ /* Decrement PC if that was requested, this requires a PC sync. */
+ if (act != NULL) {
+ duk_hthread_sync_currpc(thr);
+ old_pc = act->curr_pc;
+ fun = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
+
+ /* Short circuit if is safe: if act->curr_pc != NULL, 'fun' is
+ * guaranteed to be a non-NULL Ecmascript function.
+ */
+ DUK_ASSERT(act->curr_pc == NULL ||
+ (fun != NULL && DUK_HOBJECT_IS_COMPILEDFUNCTION((duk_hobject *) fun)));
+ if (use_prev_pc &&
+ act->curr_pc != NULL &&
+ act->curr_pc > DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, fun)) {
+ act->curr_pc--;
+ }
+ }
+
+ /* Process debug messages until we are no longer paused. */
+
+ /* NOTE: This is a bit fragile. It's important to ensure that neither
+ * duk_debug_send_status() or duk_debug_process_messages() throws an
+ * error or act->curr_pc will never be reset.
+ */
+
+ thr->heap->dbg_processing = 1;
+ duk_debug_send_status(thr);
+ while (thr->heap->dbg_paused) {
+ DUK_ASSERT(thr->heap->dbg_processing);
+ duk_debug_process_messages(thr, 0 /*no_block*/);
+ }
+ thr->heap->dbg_processing = 0;
+
+ /* XXX: Decrementing and restoring act->curr_pc works now, but if the
+ * debugger message loop gains the ability to adjust the current PC
+ * (e.g. a forced jump) restoring the PC here will break. Another
+ * approach would be to use a state flag for the "decrement 1 from
+ * topmost activation's PC" and take it into account whenever dealing
+ * with PC values.
+ */
+ if (act != NULL) {
+ act->curr_pc = old_pc; /* restore PC */
+ }
+}
+
DUK_INTERNAL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t no_block) {
duk_context *ctx = (duk_context *) thr;
#if defined(DUK_USE_ASSERTIONS)
@@ -39698,6 +40909,8 @@ DUK_INTERNAL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t
DUK_ASSERT(thr != NULL);
DUK_UNREF(ctx);
+ DUK_ASSERT(thr->heap != NULL);
+ DUK_ASSERT(DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap));
#if defined(DUK_USE_ASSERTIONS)
entry_top = duk_get_top(ctx);
#endif
@@ -39795,6 +41008,7 @@ DUK_INTERNAL duk_bool_t duk_debug_remove_breakpoint(duk_hthread *thr, duk_small_
DUK_ASSERT(thr != NULL);
heap = thr->heap;
DUK_ASSERT(heap != NULL);
+ DUK_ASSERT(DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap));
DUK_ASSERT_DISABLE(breakpoint_index >= 0); /* unsigned */
if (breakpoint_index >= heap->dbg_breakpoint_count) {
@@ -39816,6 +41030,7 @@ DUK_INTERNAL duk_bool_t duk_debug_remove_breakpoint(duk_hthread *thr, duk_small_
heap->dbg_breakpoints_active[0] = (duk_breakpoint *) NULL;
DUK_HSTRING_DECREF(thr, h); /* side effects */
+ DUK_UNREF(h); /* w/o refcounting */
/* Breakpoint entries above the used area are left as garbage. */
@@ -39880,7 +41095,7 @@ DUK_INTERNAL duk_bool_t duk_debug_remove_breakpoint(duk_hthread *thr, duk_small_
* The user error handler is stored in 'Duktape.errCreate' or
* 'Duktape.errThrow' depending on whether we're augmenting the error at
* creation or throw time. There are several alternatives to this approach,
- * see doc/error-objects.txt for discussion.
+ * see doc/error-objects.rst for discussion.
*
* Note: since further longjmp()s may occur while calling the error handler
* (for many reasons, e.g. a labeled 'break' inside the handler), the
@@ -40006,7 +41221,7 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
* and cheap to create. It may change arbitrarily from version to version.
* It should be decoded/accessed through version specific accessors only.
*
- * See doc/error-objects.txt.
+ * See doc/error-objects.rst.
*/
DUK_DDD(DUK_DDDPRINT("adding traceback to object: %!T",
@@ -40093,10 +41308,7 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
* PC points to next instruction, find offending PC. Note that
* PC == 0 for native code.
*/
- pc = thr_callstack->callstack[i].pc;
- if (pc > 0) {
- pc--;
- }
+ pc = duk_hthread_get_act_prev_pc(thr_callstack, thr_callstack->callstack + i);
DUK_ASSERT_DISABLE(pc >= 0); /* unsigned */
DUK_ASSERT((duk_double_t) pc < DUK_DOUBLE_2TO32); /* assume PC is at most 32 bits and non-negative */
d = ((duk_double_t) thr_callstack->callstack[i].flags) * DUK_DOUBLE_2TO32 + (duk_double_t) pc;
@@ -40178,10 +41390,7 @@ DUK_LOCAL void duk__err_augment_builtin_throw(duk_hthread *thr, duk_hthread *thr
/* PC points to next instruction, find offending PC. Note that
* PC == 0 for native code.
*/
- pc = act->pc;
- if (pc > 0) {
- pc--;
- }
+ pc = duk_hthread_get_act_prev_pc(thr, act);
DUK_ASSERT_DISABLE(pc >= 0); /* unsigned */
DUK_ASSERT((duk_double_t) pc < DUK_DOUBLE_2TO32); /* assume PC is at most 32 bits and non-negative */
act = NULL; /* invalidated by pushes, so get out of the way */
@@ -40339,6 +41548,37 @@ DUK_INTERNAL void duk_err_longjmp(duk_hthread *thr) {
/* include removed: duk_internal.h */
/*
+ * Helper to walk the thread chain and see if there is an active error
+ * catcher. Protected calls or finally blocks aren't considered catching.
+ */
+
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+DUK_LOCAL duk_bool_t duk__have_active_catcher(duk_hthread *thr) {
+ /*
+ * XXX: As noted above, a protected API call won't be counted as a
+ * catcher. This is usually convenient, e.g. in the case of a top-
+ * level duk_pcall(), but may not always be desirable. Perhaps add an
+ * argument to treat them as catchers?
+ */
+
+ duk_size_t i;
+
+ DUK_ASSERT(thr != NULL);
+
+ while (thr != NULL) {
+ for (i = 0; i < thr->catchstack_top; i++) {
+ duk_catcher *cat = thr->catchstack + i;
+ if (DUK_CAT_HAS_CATCH_ENABLED(cat)) {
+ return 1; /* all we need to know */
+ }
+ }
+ thr = thr->resumer;
+ }
+ return 0;
+}
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
+
+/*
* Get prototype object for an integer error code.
*/
@@ -40374,15 +41614,61 @@ DUK_INTERNAL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, duk_er
*/
DUK_INTERNAL void duk_err_setup_heap_ljstate(duk_hthread *thr, duk_small_int_t lj_type) {
- duk_tval tv_tmp;
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+ /* If something is thrown with the debugger attached and nobody will
+ * catch it, execution is paused before the longjmp, turning over
+ * control to the debug client. This allows local state to be examined
+ * before the stack is unwound. Errors are not intercepted when debug
+ * message loop is active (e.g. for Eval).
+ */
+
+ /* XXX: Allow customizing the pause and notify behavior at runtime
+ * using debugger runtime flags. For now the behavior is fixed using
+ * config options.
+ */
+#if defined(DUK_USE_DEBUGGER_THROW_NOTIFY) || defined(DUK_USE_DEBUGGER_PAUSE_UNCAUGHT)
+ if (DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap) &&
+ !thr->heap->dbg_processing &&
+ lj_type == DUK_LJ_TYPE_THROW) {
+ duk_context *ctx = (duk_context *) thr;
+ duk_bool_t fatal;
+ duk_hobject *h_obj;
+
+ /* Don't intercept a DoubleError, we may have caused the initial double
+ * fault and attempting to intercept it will cause us to be called
+ * recursively and exhaust the C stack.
+ */
+ h_obj = duk_get_hobject(ctx, -1);
+ if (h_obj == thr->builtins[DUK_BIDX_DOUBLE_ERROR]) {
+ DUK_D(DUK_DPRINT("built-in DoubleError instance thrown, not intercepting"));
+ goto skip_throw_intercept;
+ }
+
+ DUK_D(DUK_DPRINT("throw with debugger attached, report to client"));
+
+ fatal = !duk__have_active_catcher(thr);
+
+#if defined(DUK_USE_DEBUGGER_THROW_NOTIFY)
+ /* Report it to the debug client */
+ duk_debug_send_throw(thr, fatal);
+#endif
+
+#if defined(DUK_USE_DEBUGGER_PAUSE_UNCAUGHT)
+ if (fatal) {
+ DUK_D(DUK_DPRINT("throw will be fatal, halt before longjmp"));
+ duk_debug_halt_execution(thr, 1 /*use_prev_pc*/);
+ }
+#endif
+ }
+
+ skip_throw_intercept:
+#endif /* DUK_USE_DEBUGGER_THROW_NOTIFY || DUK_USE_DEBUGGER_PAUSE_UNCAUGHT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
thr->heap->lj.type = lj_type;
DUK_ASSERT(thr->valstack_top > thr->valstack);
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value1);
- DUK_TVAL_SET_TVAL(&thr->heap->lj.value1, thr->valstack_top - 1);
- DUK_TVAL_INCREF(thr, &thr->heap->lj.value1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, thr->valstack_top - 1); /* side effects */
duk_pop((duk_context *) thr);
}
@@ -40430,6 +41716,23 @@ DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code)
thr->heap->handling_error = 1;
+ if (!double_error) {
+ /* Allow headroom for calls during error handling (see GH-191).
+ * We allow space for 10 additional recursions, with one extra
+ * for, e.g. a print() call at the deepest level.
+ */
+ DUK_ASSERT(thr->callstack_max == DUK_CALLSTACK_DEFAULT_MAX);
+ thr->callstack_max = DUK_CALLSTACK_DEFAULT_MAX + DUK_CALLSTACK_GROW_STEP + 11;
+ }
+
+ DUK_ASSERT(thr->callstack_max == DUK_CALLSTACK_DEFAULT_MAX + DUK_CALLSTACK_GROW_STEP + 11); /* just making sure */
+
+ /* Sync so that augmentation sees up-to-date activations, NULL
+ * thr->ptr_curr_pc so that it's not used if side effects occur
+ * in augmentation or longjmp handling.
+ */
+ duk_hthread_sync_and_null_currpc(thr);
+
/*
* Create and push an error object onto the top of stack.
* If a "double error" occurs, use a fixed error instance
@@ -40490,10 +41793,11 @@ DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code)
* Finally, longjmp
*/
- thr->heap->handling_error = 0;
-
duk_err_setup_heap_ljstate(thr, DUK_LJ_TYPE_THROW);
+ thr->callstack_max = DUK_CALLSTACK_DEFAULT_MAX; /* reset callstack limit */
+ thr->heap->handling_error = 0;
+
DUK_DDD(DUK_DDDPRINT("THROW ERROR (INTERNAL): %!iT, %!iT (after throw augment)",
(duk_tval *) &thr->heap->lj.value1, (duk_tval *) &thr->heap->lj.value2));
@@ -40557,10 +41861,18 @@ DUK_INTERNAL void duk_error_throw_from_negative_rc(duk_hthread *thr, duk_ret_t r
/* include removed: duk_internal.h */
-DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk_small_uint_t flags) {
+/* Allocate a new duk_hbuffer of a certain type and return a pointer to it
+ * (NULL on error). Write buffer data pointer to 'out_bufdata' (only if
+ * allocation successful).
+ */
+DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk_small_uint_t flags, void **out_bufdata) {
duk_hbuffer *res = NULL;
+ duk_size_t header_size;
duk_size_t alloc_size;
+ DUK_ASSERT(heap != NULL);
+ DUK_ASSERT(out_bufdata != NULL);
+
DUK_DDD(DUK_DDDPRINT("allocate hbuffer"));
/* Size sanity check. Should not be necessary because caller is
@@ -40570,12 +41882,17 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
*/
if (size > DUK_HBUFFER_MAX_BYTELEN) {
DUK_D(DUK_DPRINT("hbuffer alloc failed: size too large: %ld", (long) size));
- return NULL;
+ return NULL; /* no need to write 'out_bufdata' */
}
- if (flags & DUK_BUF_FLAG_DYNAMIC) {
+ if (flags & DUK_BUF_FLAG_EXTERNAL) {
+ header_size = sizeof(duk_hbuffer_external);
+ alloc_size = sizeof(duk_hbuffer_external);
+ } if (flags & DUK_BUF_FLAG_DYNAMIC) {
+ header_size = sizeof(duk_hbuffer_dynamic);
alloc_size = sizeof(duk_hbuffer_dynamic);
} else {
+ header_size = sizeof(duk_hbuffer_fixed);
alloc_size = sizeof(duk_hbuffer_fixed) + size;
DUK_ASSERT(alloc_size >= sizeof(duk_hbuffer_fixed)); /* no wrapping */
}
@@ -40588,20 +41905,30 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
/* zero everything unless requested not to do so */
#if defined(DUK_USE_ZERO_BUFFER_DATA)
DUK_MEMZERO((void *) res,
- (flags & DUK_BUF_FLAG_NOZERO) ?
- ((flags & DUK_BUF_FLAG_DYNAMIC) ?
- sizeof(duk_hbuffer_dynamic) :
- sizeof(duk_hbuffer_fixed)) :
- alloc_size);
+ (flags & DUK_BUF_FLAG_NOZERO) ? header_size : alloc_size);
#else
- DUK_MEMZERO((void *) res,
- (flags & DUK_BUF_FLAG_DYNAMIC) ? sizeof(duk_hbuffer_dynamic) : sizeof(duk_hbuffer_fixed));
+ DUK_MEMZERO((void *) res, header_size);
#endif
- if (flags & DUK_BUF_FLAG_DYNAMIC) {
+ if (flags & DUK_BUF_FLAG_EXTERNAL) {
+ duk_hbuffer_external *h;
+ h = (duk_hbuffer_external *) res;
+ DUK_UNREF(h);
+ *out_bufdata = NULL;
+#if defined(DUK_USE_EXPLICIT_NULL_INIT)
+#if defined(DUK_USE_HEAPPTR16)
+/* the compressed pointer is zeroed which maps to NULL, so nothing to do. */
+#else
+ DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap, h, NULL);
+#endif
+#endif
+ DUK_ASSERT(DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap, h) == NULL);
+ } else if (flags & DUK_BUF_FLAG_DYNAMIC) {
duk_hbuffer_dynamic *h = (duk_hbuffer_dynamic *) res;
void *ptr;
+
if (size > 0) {
+ DUK_ASSERT(!(flags & DUK_BUF_FLAG_EXTERNAL)); /* alloc external with size zero */
DUK_DDD(DUK_DDDPRINT("dynamic buffer with nonzero size, alloc actual buffer"));
#ifdef DUK_USE_ZERO_BUFFER_DATA
ptr = DUK_ALLOC_ZEROED(heap, size);
@@ -40612,9 +41939,11 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
/* Because size > 0, NULL check is correct */
goto error;
}
+ *out_bufdata = ptr;
DUK_HBUFFER_DYNAMIC_SET_DATA_PTR(heap, h, ptr);
} else {
+ *out_bufdata = NULL;
#if defined(DUK_USE_EXPLICIT_NULL_INIT)
#if defined(DUK_USE_HEAPPTR16)
/* the compressed pointer is zeroed which maps to NULL, so nothing to do. */
@@ -40624,6 +41953,8 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
#endif
DUK_ASSERT(DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap, h) == NULL);
}
+ } else {
+ *out_bufdata = (void *) ((duk_hbuffer_fixed *) res + 1);
}
DUK_HBUFFER_SET_SIZE(res, size);
@@ -40631,6 +41962,11 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
DUK_HEAPHDR_SET_TYPE(&res->hdr, DUK_HTYPE_BUFFER);
if (flags & DUK_BUF_FLAG_DYNAMIC) {
DUK_HBUFFER_SET_DYNAMIC(res);
+ if (flags & DUK_BUF_FLAG_EXTERNAL) {
+ DUK_HBUFFER_SET_EXTERNAL(res);
+ }
+ } else {
+ DUK_ASSERT(!(flags & DUK_BUF_FLAG_EXTERNAL));
}
DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, &res->hdr);
@@ -40641,7 +41977,7 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
DUK_DD(DUK_DDPRINT("hbuffer allocation failed"));
DUK_FREE(heap, res);
- return NULL;
+ return NULL; /* no need to write 'out_bufdata' */
}
/* For indirect allocs. */
@@ -40676,6 +42012,7 @@ DUK_INTERNAL void duk_hbuffer_resize(duk_hthread *thr, duk_hbuffer_dynamic *buf,
DUK_ASSERT(thr != NULL);
DUK_ASSERT(buf != NULL);
DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(buf));
+ DUK_ASSERT(!DUK_HBUFFER_HAS_EXTERNAL(buf));
/*
* Maximum size check
@@ -40731,12 +42068,14 @@ DUK_INTERNAL void duk_hbuffer_reset(duk_hthread *thr, duk_hbuffer_dynamic *buf)
DUK_ASSERT(thr != NULL);
DUK_ASSERT(buf != NULL);
DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(buf));
+ DUK_ASSERT(!DUK_HBUFFER_HAS_EXTERNAL(buf));
duk_hbuffer_resize(thr, buf, 0);
}
/* include removed: duk_internal.h */
#line 2 "duk_hbufferobject_misc.c"
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
DUK_INTERNAL duk_uint_t duk_hbufferobject_clamp_bytelength(duk_hbufferobject *h_bufobj, duk_uint_t len) {
duk_uint_t buf_size;
duk_uint_t buf_avail;
@@ -40753,6 +42092,7 @@ DUK_INTERNAL duk_uint_t duk_hbufferobject_clamp_bytelength(duk_hbufferobject *h_
return buf_avail >= len ? len : buf_avail;
}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
#line 1 "duk_heap_alloc.c"
/*
* duk_heap allocation and freeing.
@@ -40812,7 +42152,7 @@ DUK_INTERNAL void duk_free_hbuffer_inner(duk_heap *heap, duk_hbuffer *h) {
DUK_ASSERT(heap != NULL);
DUK_ASSERT(h != NULL);
- if (DUK_HBUFFER_HAS_DYNAMIC(h)) {
+ if (DUK_HBUFFER_HAS_DYNAMIC(h) && !DUK_HBUFFER_HAS_EXTERNAL(h)) {
duk_hbuffer_dynamic *g = (duk_hbuffer_dynamic *) h;
DUK_DDD(DUK_DDDPRINT("free dynamic buffer %p", (void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap, g)));
DUK_FREE(heap, DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap, g));
@@ -41273,6 +42613,7 @@ DUK_LOCAL void duk__dump_type_sizes(void) {
DUK__DUMPSZ(duk_hbuffer);
DUK__DUMPSZ(duk_hbuffer_fixed);
DUK__DUMPSZ(duk_hbuffer_dynamic);
+ DUK__DUMPSZ(duk_hbuffer_external);
DUK__DUMPSZ(duk_propaccessor);
DUK__DUMPSZ(duk_propvalue);
DUK__DUMPSZ(duk_propdesc);
@@ -41409,6 +42750,10 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
DUK_D(DUK_DPRINT("self tests passed"));
#endif
+ /*
+ * Computed values (e.g. INFINITY)
+ */
+
#ifdef DUK_USE_COMPUTED_NAN
do {
/* Workaround for some exotic platforms where NAN is missing
@@ -41425,10 +42770,6 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
} while (0);
#endif
- /*
- * Computed values (e.g. INFINITY)
- */
-
#ifdef DUK_USE_COMPUTED_INFINITY
do {
/* Similar workaround for INFINITY. */
@@ -41514,7 +42855,7 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
/* res->mark_and_sweep_trigger_counter == 0 -> now causes immediate GC; which is OK */
res->call_recursion_depth = 0;
- res->call_recursion_limit = DUK_HEAP_DEFAULT_CALL_RECURSION_LIMIT;
+ res->call_recursion_limit = DUK_USE_NATIVE_CALL_RECLIMIT;
/* XXX: use the pointer as a seed for now: mix in time at least */
@@ -41532,8 +42873,8 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
#endif
DUK_ASSERT(res->lj.type == DUK_LJ_TYPE_UNKNOWN); /* zero */
- DUK_TVAL_SET_UNDEFINED_UNUSED(&res->lj.value1);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&res->lj.value2);
+ DUK_TVAL_SET_UNDEFINED(&res->lj.value1);
+ DUK_TVAL_SET_UNDEFINED(&res->lj.value2);
#if (DUK_STRTAB_INITIAL_SIZE < DUK_UTIL_MIN_HASH_PRIME)
#error initial heap stringtable size is defined incorrectly
@@ -41847,7 +43188,7 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) {
duk_tval *tv;
tv = t->valstack;
- while (tv < t->valstack_end) {
+ while (tv < t->valstack_top) {
duk__mark_tval(heap, tv);
tv++;
}
@@ -41892,7 +43233,7 @@ DUK_LOCAL void duk__mark_heaphdr(duk_heap *heap, duk_heaphdr *h) {
}
DUK_HEAPHDR_SET_REACHABLE(h);
- if (heap->mark_and_sweep_recursion_depth >= DUK_HEAP_MARK_AND_SWEEP_RECURSION_LIMIT) {
+ if (heap->mark_and_sweep_recursion_depth >= DUK_USE_MARK_AND_SWEEP_RECLIMIT) {
/* log this with a normal debug level because this should be relatively rare */
DUK_D(DUK_DPRINT("mark-and-sweep recursion limit reached, marking as temproot: %p", (void *) h));
DUK_HEAP_SET_MARKANDSWEEP_RECLIMIT_REACHED(heap);
@@ -42809,6 +44150,52 @@ DUK_LOCAL void duk__assert_valid_refcounts(duk_heap *heap) {
#endif /* DUK_USE_ASSERTIONS */
/*
+ * Finalizer torture. Do one fake finalizer call which causes side effects
+ * similar to one or more finalizers on actual objects.
+ */
+
+#if defined(DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE)
+DUK_LOCAL duk_ret_t duk__markandsweep_fake_finalizer(duk_context *ctx) {
+ DUK_D(DUK_DPRINT("fake mark-and-sweep torture finalizer executed"));
+
+ /* Require a lot of stack to force a value stack grow/shrink.
+ * Recursive mark-and-sweep is prevented by allocation macros
+ * so this won't trigger another mark-and-sweep.
+ */
+ duk_require_stack(ctx, 100000);
+
+ /* XXX: do something to force a callstack grow/shrink, perhaps
+ * just a manual forced resize or a forced relocating realloc?
+ */
+
+ return 0;
+}
+
+DUK_LOCAL void duk__markandsweep_torture_finalizer(duk_hthread *thr) {
+ duk_context *ctx;
+ duk_int_t rc;
+
+ DUK_ASSERT(thr != NULL);
+ ctx = (duk_context *) thr;
+
+ /* Avoid fake finalization when callstack limit has been reached.
+ * Otherwise a callstack limit error will be created, then refzero'ed.
+ */
+ if (thr->heap->call_recursion_depth >= thr->heap->call_recursion_limit ||
+ thr->callstack_size + 2 * DUK_CALLSTACK_GROW_STEP >= thr->callstack_max /*approximate*/) {
+ DUK_D(DUK_DPRINT("call recursion depth reached, avoid fake mark-and-sweep torture finalizer"));
+ return;
+ }
+
+ /* Run fake finalizer. Avoid creating unnecessary garbage. */
+ duk_push_c_function(ctx, duk__markandsweep_fake_finalizer, 0 /*nargs*/);
+ rc = duk_pcall(ctx, 0 /*nargs*/);
+ DUK_UNREF(rc); /* ignored */
+ duk_pop(ctx);
+}
+#endif /* DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE */
+
+/*
* Main mark-and-sweep function.
*
* 'flags' represents the features requested by the caller. The current
@@ -42829,6 +44216,9 @@ DUK_INTERNAL duk_bool_t duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t
* If we don't have a thread, the entire mark-and-sweep is now
* skipped (although we could just skip finalizations).
*/
+ /* XXX: if thr != NULL, the thr may still be in the middle of
+ * initialization; improve the thread viability test.
+ */
thr = duk__get_temp_hthread(heap);
if (thr == NULL) {
DUK_D(DUK_DPRINT("temporary hack: gc skipped because we don't have a temp thread"));
@@ -42995,10 +44385,26 @@ DUK_INTERNAL duk_bool_t duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t
* already happened, this is probably good enough for now.
*/
- if (!(flags & DUK_MS_FLAG_NO_FINALIZERS)) {
- duk__run_object_finalizers(heap);
+#if defined(DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE)
+ /* Cannot simulate individual finalizers because finalize_list only
+ * contains objects with actual finalizers. But simulate side effects
+ * from finalization by doing a bogus function call and resizing the
+ * stacks.
+ */
+ if (flags & DUK_MS_FLAG_NO_FINALIZERS) {
+ DUK_D(DUK_DPRINT("skip mark-and-sweep torture finalizer, DUK_MS_FLAG_NO_FINALIZERS is set"));
+ } else if (!(thr->valstack != NULL && thr->callstack != NULL && thr->catchstack != NULL)) {
+ DUK_D(DUK_DPRINT("skip mark-and-sweep torture finalizer, thread not yet viable"));
} else {
+ DUK_D(DUK_DPRINT("run mark-and-sweep torture finalizer"));
+ duk__markandsweep_torture_finalizer(thr);
+ }
+#endif /* DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE */
+
+ if (flags & DUK_MS_FLAG_NO_FINALIZERS) {
DUK_D(DUK_DPRINT("finalizer run skipped because DUK_MS_FLAG_NO_FINALIZERS is set"));
+ } else {
+ duk__run_object_finalizers(heap);
}
/*
@@ -43628,7 +45034,7 @@ DUK_LOCAL void duk__refcount_finalize_hobject(duk_hthread *thr, duk_hobject *h)
duk_tval *tv;
tv = t->valstack;
- while (tv < t->valstack_end) {
+ while (tv < t->valstack_top) {
duk_tval_decref(thr, tv);
tv++;
}
@@ -43674,6 +45080,60 @@ DUK_INTERNAL void duk_heaphdr_refcount_finalize(duk_hthread *thr, duk_heaphdr *h
}
}
+#if defined(DUK_USE_REFZERO_FINALIZER_TORTURE)
+DUK_LOCAL duk_ret_t duk__refcount_fake_finalizer(duk_context *ctx) {
+ DUK_UNREF(ctx);
+ DUK_D(DUK_DPRINT("fake refcount torture finalizer executed"));
+#if 0
+ DUK_DD(DUK_DDPRINT("fake torture finalizer for: %!T", duk_get_tval(ctx, 0)));
+#endif
+ /* Require a lot of stack to force a value stack grow/shrink. */
+ duk_require_stack(ctx, 100000);
+
+ /* XXX: do something to force a callstack grow/shrink, perhaps
+ * just a manual forced resize?
+ */
+ return 0;
+}
+
+DUK_LOCAL void duk__refcount_run_torture_finalizer(duk_hthread *thr, duk_hobject *obj) {
+ duk_context *ctx;
+ duk_int_t rc;
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(obj != NULL);
+ ctx = (duk_context *) thr;
+
+ /* Avoid fake finalization for the duk__refcount_fake_finalizer function
+ * itself, otherwise we're in infinite recursion.
+ */
+ if (DUK_HOBJECT_HAS_NATIVEFUNCTION(obj)) {
+ if (((duk_hnativefunction *) obj)->func == duk__refcount_fake_finalizer) {
+ DUK_DD(DUK_DDPRINT("avoid fake torture finalizer for duk__refcount_fake_finalizer itself"));
+ return;
+ }
+ }
+ /* Avoid fake finalization when callstack limit has been reached.
+ * Otherwise a callstack limit error will be created, then refzero'ed,
+ * and we're in an infinite loop.
+ */
+ if (thr->heap->call_recursion_depth >= thr->heap->call_recursion_limit ||
+ thr->callstack_size + 2 * DUK_CALLSTACK_GROW_STEP >= thr->callstack_max /*approximate*/) {
+ DUK_D(DUK_DPRINT("call recursion depth reached, avoid fake torture finalizer"));
+ return;
+ }
+
+ /* Run fake finalizer. Avoid creating new refzero queue entries
+ * so that we are not forced into a forever loop.
+ */
+ duk_push_c_function(ctx, duk__refcount_fake_finalizer, 1 /*nargs*/);
+ duk_push_hobject(ctx, obj);
+ rc = duk_pcall(ctx, 1);
+ DUK_UNREF(rc); /* ignored */
+ duk_pop(ctx);
+}
+#endif /* DUK_USE_REFZERO_FINALIZER_TORTURE */
+
/*
* Refcount memory freeing loop.
*
@@ -43723,6 +45183,20 @@ DUK_LOCAL void duk__refzero_free_pending(duk_hthread *thr) {
DUK_ASSERT(DUK_HEAPHDR_GET_PREV(heap, h1) == NULL);
DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(h1) == DUK_HTYPE_OBJECT); /* currently, always the case */
+#if defined(DUK_USE_REFZERO_FINALIZER_TORTURE)
+ /* Torture option to shake out finalizer side effect issues:
+ * make a bogus function call for every finalizable object,
+ * essentially simulating the case where everything has a
+ * finalizer.
+ */
+ DUK_DD(DUK_DDPRINT("refzero torture enabled, fake finalizer"));
+ DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(h1) == 0);
+ DUK_HEAPHDR_PREINC_REFCOUNT(h1); /* bump refcount to prevent refzero during finalizer processing */
+ duk__refcount_run_torture_finalizer(thr, obj); /* must never longjmp */
+ DUK_HEAPHDR_PREDEC_REFCOUNT(h1); /* remove artificial bump */
+ DUK_ASSERT_DISABLE(h1->h_refcount >= 0); /* refcount is unsigned, so always true */
+#endif
+
/*
* Finalizer check.
*
@@ -45288,6 +46762,7 @@ DUK_INTERNAL duk_hstring *duk_heap_string_intern_u32_checked(duk_hthread *thr, d
}
/* find and remove string from stringtable; caller must free the string itself */
+#if defined(DUK_USE_REFERENCE_COUNTING)
DUK_INTERNAL void duk_heap_string_remove(duk_heap *heap, duk_hstring *h) {
DUK_DDD(DUK_DDDPRINT("remove string from stringtable: %!O", (duk_heaphdr *) h));
@@ -45306,6 +46781,7 @@ DUK_INTERNAL void duk_heap_string_remove(duk_heap *heap, duk_hstring *h) {
#error internal error, invalid strtab options
#endif
}
+#endif
#if defined(DUK_USE_MARK_AND_SWEEP) && defined(DUK_USE_MS_STRINGTABLE_RESIZE)
DUK_INTERNAL void duk_heap_force_strtab_resize(duk_heap *heap) {
@@ -45579,6 +47055,7 @@ DUK_INTERNAL duk_hthread *duk_hthread_alloc(duk_heap *heap, duk_uint_t hobject_f
duk__init_object_parts(heap, &res->obj, hobject_flags);
#ifdef DUK_USE_EXPLICIT_NULL_INIT
+ res->ptr_curr_pc = NULL;
res->heap = NULL;
res->valstack = NULL;
res->valstack_end = NULL;
@@ -46002,7 +47479,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_context *ctx, duk_small_uint
duk_tval *tv;
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, curr, i);
- if (DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
+ if (DUK_TVAL_IS_UNUSED(tv)) {
continue;
}
k = duk_heap_string_intern_u32_checked(thr, i);
@@ -46042,7 +47519,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_context *ctx, duk_small_uint
}
DUK_ASSERT(DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, curr, i) ||
- !DUK_TVAL_IS_UNDEFINED_UNUSED(&DUK_HOBJECT_E_GET_VALUE_PTR(thr->heap, curr, i)->v));
+ !DUK_TVAL_IS_UNUSED(&DUK_HOBJECT_E_GET_VALUE_PTR(thr->heap, curr, i)->v));
duk_push_hstring(ctx, k);
duk_push_true(ctx);
@@ -46159,7 +47636,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_enumerator_next(duk_context *ctx, duk_bool_t
k = DUK_HOBJECT_E_GET_KEY(thr->heap, e, idx);
DUK_ASSERT(k != NULL);
DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, e, idx));
- DUK_ASSERT(!DUK_TVAL_IS_UNDEFINED_UNUSED(&DUK_HOBJECT_E_GET_VALUE(thr->heap, e, idx).v));
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(&DUK_HOBJECT_E_GET_VALUE(thr->heap, e, idx).v));
idx++;
@@ -46372,7 +47849,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *thr, d
return 0;
}
-DUK_INTERNAL void duk_hobject_set_prototype(duk_hthread *thr, duk_hobject *h, duk_hobject *p) {
+DUK_INTERNAL void duk_hobject_set_prototype_updref(duk_hthread *thr, duk_hobject *h, duk_hobject *p) {
#ifdef DUK_USE_REFERENCE_COUNTING
duk_hobject *tmp;
@@ -46394,7 +47871,7 @@ DUK_INTERNAL void duk_hobject_set_prototype(duk_hthread *thr, duk_hobject *h, du
*
* The run-time pc2line data is bit-packed, and documented in:
*
- * doc/function-objects.txt
+ * doc/function-objects.rst
*/
/* include removed: duk_internal.h */
@@ -46427,7 +47904,7 @@ DUK_INTERNAL void duk_hobject_pc2line_pack(duk_hthread *thr, duk_compiler_instr
duk_push_dynamic_buffer(ctx, (duk_size_t) curr_offset);
h_buf = (duk_hbuffer_dynamic *) duk_get_hbuffer(ctx, -1);
DUK_ASSERT(h_buf != NULL);
- DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(h_buf));
+ DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(h_buf) && !DUK_HBUFFER_HAS_EXTERNAL(h_buf));
hdr = (duk_uint32_t *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(thr->heap, h_buf);
DUK_ASSERT(hdr != NULL);
@@ -46528,7 +48005,7 @@ DUK_LOCAL duk_uint_fast32_t duk__hobject_pc2line_query_raw(duk_hthread *thr, duk
duk_uint_fast32_t curr_line;
DUK_ASSERT(buf != NULL);
- DUK_ASSERT(!DUK_HBUFFER_HAS_DYNAMIC((duk_hbuffer *) buf));
+ DUK_ASSERT(!DUK_HBUFFER_HAS_DYNAMIC((duk_hbuffer *) buf) && !DUK_HBUFFER_HAS_EXTERNAL((duk_hbuffer *) buf));
DUK_UNREF(thr);
/*
@@ -46627,7 +48104,7 @@ DUK_INTERNAL duk_uint_fast32_t duk_hobject_pc2line_query(duk_context *ctx, duk_i
duk_get_prop_stridx(ctx, idx_func, DUK_STRIDX_INT_PC2LINE);
pc2line = (duk_hbuffer_fixed *) duk_get_hbuffer(ctx, -1);
if (pc2line != NULL) {
- DUK_ASSERT(!DUK_HBUFFER_HAS_DYNAMIC((duk_hbuffer *) pc2line));
+ DUK_ASSERT(!DUK_HBUFFER_HAS_DYNAMIC((duk_hbuffer *) pc2line) && !DUK_HBUFFER_HAS_EXTERNAL((duk_hbuffer *) pc2line));
line = duk__hobject_pc2line_query_raw((duk_hthread *) ctx, pc2line, (duk_uint_fast32_t) pc);
} else {
line = 0;
@@ -46643,8 +48120,8 @@ DUK_INTERNAL duk_uint_fast32_t duk_hobject_pc2line_query(duk_context *ctx, duk_i
* Hobject property set/get functionality.
*
* This is very central functionality for size, performance, and compliance.
- * It is also rather intricate; see hobject-algorithms.txt for discussion on
- * the algorithms and memory-management.txt for discussion on refcounts and
+ * It is also rather intricate; see hobject-algorithms.rst for discussion on
+ * the algorithms and memory-management.rst for discussion on refcounts and
* side effect issues.
*
* Notes:
@@ -46889,7 +48366,7 @@ DUK_LOCAL void duk__compute_a_stats(duk_hthread *thr, duk_hobject *obj, duk_uint
a = DUK_HOBJECT_A_GET_BASE(thr->heap, obj);
for (i = 0; i < DUK_HOBJECT_GET_ASIZE(obj); i++) {
duk_tval *tv = a++;
- if (!DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
+ if (!DUK_TVAL_IS_UNUSED(tv)) {
used++;
highest_idx = i;
}
@@ -47320,7 +48797,7 @@ void duk__realloc_props(duk_hthread *thr,
DUK_ASSERT(DUK_HOBJECT_GET_PROPS(thr->heap, obj) != NULL);
tv1 = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, i);
- if (DUK_TVAL_IS_UNDEFINED_UNUSED(tv1)) {
+ if (DUK_TVAL_IS_UNUSED(tv1)) {
continue;
}
@@ -47412,7 +48889,7 @@ void duk__realloc_props(duk_hthread *thr,
/* fill new entries with -unused- (required, gc reachable) */
for (i = DUK_HOBJECT_GET_ASIZE(obj); i < new_a_size; i++) {
duk_tval *tv = &new_a[i];
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
+ DUK_TVAL_SET_UNUSED(tv);
}
} else {
#ifdef DUK_USE_ASSERTIONS
@@ -47423,7 +48900,7 @@ void duk__realloc_props(duk_hthread *thr,
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, i);
/* current assertion is quite strong: decref's and set to unused */
- DUK_ASSERT(DUK_TVAL_IS_UNDEFINED_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_UNUSED(tv));
}
}
#endif
@@ -47566,7 +49043,7 @@ void duk__realloc_props(duk_hthread *thr,
i--;
DUK_ASSERT(new_e_k != NULL);
DUK_ASSERT(new_e_k[i] != NULL);
- DUK_HSTRING_DECREF(thr, new_e_k[i]);
+ DUK_HSTRING_DECREF(thr, new_e_k[i]); /* side effects */
}
#ifdef DUK_USE_MARK_AND_SWEEP
@@ -47973,8 +49450,6 @@ DUK_INTERNAL duk_bool_t duk_hobject_get_internal_value(duk_heap *heap, duk_hobje
DUK_ASSERT(obj != NULL);
DUK_ASSERT(tv_out != NULL);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv_out);
-
/* always in entry part, no need to look up parents etc */
duk_hobject_find_existing_entry(heap, obj, DUK_HEAP_STRING_INT_VALUE(heap), &e_idx, &h_idx);
if (e_idx >= 0) {
@@ -47982,6 +49457,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_get_internal_value(duk_heap *heap, duk_hobje
DUK_TVAL_SET_TVAL(tv_out, DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(heap, obj, e_idx));
return 1;
}
+ DUK_TVAL_SET_UNDEFINED(tv_out);
return 0;
}
@@ -48251,7 +49727,7 @@ DUK_LOCAL duk_bool_t duk__get_own_property_desc_raw(duk_hthread *thr, duk_hobjec
if (DUK_HOBJECT_HAS_ARRAY_PART(obj) && arr_idx != DUK__NO_ARRAY_INDEX) {
if (arr_idx < DUK_HOBJECT_GET_ASIZE(obj)) {
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, arr_idx);
- if (!DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
+ if (!DUK_TVAL_IS_UNUSED(tv)) {
DUK_DDD(DUK_DDDPRINT("-> found in array part"));
if (flags & DUK__DESC_FLAG_PUSH_VALUE) {
duk_push_tval(ctx, tv);
@@ -48653,7 +50129,7 @@ DUK_LOCAL duk_tval *duk__getprop_shallow_fastpath_array_tval(duk_hthread *thr, d
DUK_DDD(DUK_DDDPRINT("key is a valid array index and inside array part"));
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, idx);
- if (!DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
+ if (!DUK_TVAL_IS_UNUSED(tv)) {
DUK_DDD(DUK_DDDPRINT("-> fast path successful"));
return tv;
}
@@ -48665,7 +50141,6 @@ DUK_LOCAL duk_tval *duk__getprop_shallow_fastpath_array_tval(duk_hthread *thr, d
DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr, duk_hobject *obj, duk_tval *tv_key, duk_tval *tv_val, duk_propdesc *temp_desc) {
duk_tval *tv;
duk_uint32_t idx;
- duk_tval tv_tmp;
duk_uint32_t old_len, new_len;
if (!(DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj) &&
@@ -48722,10 +50197,7 @@ DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr,
}
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_TVAL(tv, tv_val);
- DUK_TVAL_INCREF(thr, tv);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* note: may trigger gc and props compaction, must be last */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val); /* side effects */
DUK_DDD(DUK_DDDPRINT("array fast path success for index %ld", (long) idx));
return 1;
@@ -49185,6 +50657,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
default: {
/* number */
DUK_DDD(DUK_DDDPRINT("base object is a number, start lookup from number prototype"));
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv_obj));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_obj));
curr = thr->builtins[DUK_BIDX_NUMBER_PROTOTYPE];
break;
@@ -49580,7 +51053,6 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
duk_uint32_t arr_idx;
duk_hstring *key;
duk_tval *tv;
- duk_tval tv_tmp;
duk_bool_t rc;
DUK_DDD(DUK_DDDPRINT("new array length smaller than old (%ld -> %ld), "
@@ -49628,9 +51100,7 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
while (i > new_len) {
i--;
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, i);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_UNUSED_UPDREF(thr, tv); /* side effects */
}
*out_result_len = new_len;
@@ -49976,10 +51446,10 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
* the fast path will incorrectly ignore them.
*
* This fast path could be made compliant by falling through
- * to the slow path if the previous value was UNDEFINED_UNUSED.
- * This would also remove the need to check for extensibility.
- * Right now a non-extensible array is slower than an extensible
- * one as far as writes are concerned.
+ * to the slow path if the previous value was UNUSED. This would
+ * also remove the need to check for extensibility. Right now a
+ * non-extensible array is slower than an extensible one as far
+ * as writes are concerned.
*
* The fast path behavior is documented in more detail here:
* tests/ecmascript/test-misc-array-fast-write.js
@@ -50387,14 +51857,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
}
if (desc.e_idx >= 0) {
- duk_tval tv_tmp;
-
tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, orig, desc.e_idx);
DUK_DDD(DUK_DDDPRINT("previous entry value: %!iT", (duk_tval *) tv));
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_TVAL(tv, tv_val);
- DUK_TVAL_INCREF(thr, tv);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* note: may trigger gc and props compaction, must be last */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val); /* side effects */
/* don't touch property attributes or hash part */
DUK_DD(DUK_DDPRINT("put to an existing entry at index %ld -> new value %!iT",
(long) desc.e_idx, (duk_tval *) tv));
@@ -50403,15 +51868,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
* above is pointless for them. The check could be avoided with some
* refactoring but is probably not worth it.
*/
- duk_tval tv_tmp;
DUK_ASSERT(desc.a_idx >= 0);
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, orig, desc.a_idx);
DUK_DDD(DUK_DDDPRINT("previous array value: %!iT", (duk_tval *) tv));
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_TVAL(tv, tv_val);
- DUK_TVAL_INCREF(thr, tv);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* note: may trigger gc and props compaction, must be last */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val); /* side effects */
DUK_DD(DUK_DDPRINT("put to an existing array entry at index %ld -> new value %!iT",
(long) desc.a_idx, (duk_tval *) tv));
}
@@ -50568,7 +52029,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, orig, arr_idx);
/* prev value must be unused, no decref */
- DUK_ASSERT(DUK_TVAL_IS_UNDEFINED_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_UNUSED(tv));
DUK_TVAL_SET_TVAL(tv, tv_val);
DUK_TVAL_INCREF(thr, tv);
DUK_DD(DUK_DDPRINT("put to new array entry: %ld -> %!T",
@@ -50749,7 +52210,6 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_small_uint_t flags) {
duk_propdesc desc;
duk_tval *tv;
- duk_tval tv_tmp;
duk_uint32_t arr_idx;
duk_bool_t throw_flag;
duk_bool_t force_flag;
@@ -50790,9 +52250,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
DUK_ASSERT(desc.e_idx < 0);
tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, desc.a_idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_UNUSED_UPDREF(thr, tv); /* side effects */
goto success;
} else {
DUK_ASSERT(desc.a_idx < 0);
@@ -50823,21 +52281,20 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
tmp = DUK_HOBJECT_E_GET_VALUE_GETTER(thr->heap, obj, desc.e_idx);
DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, desc.e_idx, NULL);
DUK_UNREF(tmp);
- DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
+ DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */
tmp = DUK_HOBJECT_E_GET_VALUE_SETTER(thr->heap, obj, desc.e_idx);
DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, desc.e_idx, NULL);
DUK_UNREF(tmp);
- DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
+ DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */
} else {
tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, desc.e_idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
}
- /* this is not strictly necessary because if key == NULL, value MUST be ignored */
+#if 0
+ /* Not strictly necessary because if key == NULL, flag MUST be ignored. */
DUK_HOBJECT_E_SET_FLAGS(thr->heap, obj, desc.e_idx, 0);
- DUK_TVAL_SET_UNDEFINED_UNUSED(DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, desc.e_idx));
+#endif
/* remove key */
DUK_DDD(DUK_DDDPRINT("before removing key, e_idx %ld, key %p, key at slot %p",
@@ -50845,7 +52302,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
DUK_DDD(DUK_DDDPRINT("removing key at e_idx %ld", (long) desc.e_idx));
DUK_ASSERT(key == DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx));
DUK_HOBJECT_E_SET_KEY(thr->heap, obj, desc.e_idx, NULL);
- DUK_HSTRING_DECREF(thr, key);
+ DUK_HSTRING_DECREF(thr, key); /* side effects */
goto success;
}
@@ -51104,7 +52561,6 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
duk_propdesc desc;
duk_uint32_t arr_idx;
duk_int_t e_idx;
- duk_tval tv_tmp;
duk_tval *tv1 = NULL;
duk_tval *tv2 = NULL;
duk_small_uint_t propflags = flags & DUK_PROPDESC_FLAGS_MASK; /* mask out flags not actually stored */
@@ -51184,7 +52640,7 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
DUK_HOBJECT_E_SET_FLAGS(thr->heap, obj, e_idx, propflags);
tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, e_idx);
/* new entry: previous value is garbage; set to undefined to share write_value */
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv1);
+ DUK_TVAL_SET_UNDEFINED(tv1);
goto write_value;
write_value:
@@ -51194,10 +52650,7 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
DUK_DDD(DUK_DDDPRINT("writing/updating value: %!T -> %!T",
(duk_tval *) tv1, (duk_tval *) tv2));
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
goto pop_exit;
pop_exit:
@@ -51223,7 +52676,6 @@ DUK_INTERNAL void duk_hobject_define_property_internal_arridx(duk_hthread *thr,
duk_context *ctx = (duk_context *) thr;
duk_hstring *key;
duk_tval *tv1, *tv2;
- duk_tval tv_tmp;
DUK_DDD(DUK_DDDPRINT("define new property (internal) arr_idx fast path: thr=%p, obj=%!O, "
"arr_idx=%ld, flags=0x%02lx, val=%!T",
@@ -51250,10 +52702,7 @@ DUK_INTERNAL void duk_hobject_define_property_internal_arridx(duk_hthread *thr,
tv1 = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, arr_idx);
tv2 = duk_require_tval(ctx, -1);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
duk_pop(ctx); /* [ ...val ] -> [ ... ] */
return;
@@ -51834,7 +53283,7 @@ void duk_hobject_define_property_helper(duk_context *ctx,
duk_tval *tv_tmp = duk_require_tval(ctx, idx_value);
DUK_TVAL_SET_TVAL(&tv, tv_tmp);
} else {
- DUK_TVAL_SET_UNDEFINED_ACTUAL(&tv); /* default value */
+ DUK_TVAL_SET_UNDEFINED(&tv); /* default value */
}
if (arr_idx != DUK__NO_ARRAY_INDEX && DUK_HOBJECT_HAS_ARRAY_PART(obj)) {
@@ -52004,7 +53453,6 @@ void duk_hobject_define_property_helper(duk_context *ctx,
}
} else {
duk_bool_t rc;
- duk_tval tv_tmp;
duk_tval *tv1;
/* curr is data, desc is accessor */
@@ -52026,9 +53474,8 @@ void duk_hobject_define_property_helper(duk_context *ctx,
DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, curr.e_idx));
tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ /* XXX: just decref */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, NULL);
DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, NULL);
@@ -52069,13 +53516,13 @@ void duk_hobject_define_property_helper(duk_context *ctx,
tmp = DUK_HOBJECT_E_GET_VALUE_GETTER(thr->heap, obj, curr.e_idx);
DUK_UNREF(tmp);
DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, NULL);
- DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
+ DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */
tmp = DUK_HOBJECT_E_GET_VALUE_SETTER(thr->heap, obj, curr.e_idx);
DUK_UNREF(tmp);
DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, NULL);
- DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
+ DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */
- DUK_TVAL_SET_UNDEFINED_ACTUAL(DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx));
+ DUK_TVAL_SET_UNDEFINED(DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx));
DUK_HOBJECT_E_SLOT_CLEAR_WRITABLE(thr->heap, obj, curr.e_idx);
DUK_HOBJECT_E_SLOT_CLEAR_ACCESSOR(thr->heap, obj, curr.e_idx);
@@ -52161,7 +53608,6 @@ void duk_hobject_define_property_helper(duk_context *ctx,
if (new_flags == DUK_PROPDESC_FLAGS_WEC) {
duk_tval *tv1, *tv2;
- duk_tval tv_tmp;
DUK_DDD(DUK_DDDPRINT("array index, new property attributes match array defaults, update in-place"));
@@ -52171,10 +53617,7 @@ void duk_hobject_define_property_helper(duk_context *ctx,
tv2 = duk_require_tval(ctx, idx_value);
tv1 = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, curr.a_idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
goto success_exotics;
}
@@ -52205,7 +53648,7 @@ void duk_hobject_define_property_helper(duk_context *ctx,
DUK_UNREF(tmp);
DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, set);
DUK_HOBJECT_INCREF_ALLOWNULL(thr, set);
- DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
+ DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */
}
if (has_get) {
duk_hobject *tmp;
@@ -52217,21 +53660,17 @@ void duk_hobject_define_property_helper(duk_context *ctx,
DUK_UNREF(tmp);
DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, get);
DUK_HOBJECT_INCREF_ALLOWNULL(thr, get);
- DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
+ DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */
}
if (has_value) {
duk_tval *tv1, *tv2;
- duk_tval tv_tmp;
DUK_DDD(DUK_DDDPRINT("update existing property value"));
DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, curr.e_idx));
tv2 = duk_require_tval(ctx, idx_value);
tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
}
/*
@@ -52549,7 +53988,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_object_is_sealed_frozen_helper(duk_hthread *
*/
for (i = 0; i < DUK_HOBJECT_GET_ASIZE(obj); i++) {
duk_tval *tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, i);
- if (!DUK_TVAL_IS_UNDEFINED_UNUSED(tv)) {
+ if (!DUK_TVAL_IS_UNUSED(tv)) {
return 0;
}
}
@@ -52640,11 +54079,14 @@ DUK_INTERNAL duk_bool_t duk_hthread_init_stacks(duk_heap *heap, duk_hthread *thr
}
DUK_MEMZERO(thr->valstack, alloc_size);
thr->valstack_end = thr->valstack + DUK_VALSTACK_INITIAL_SIZE;
+#if !defined(DUK_USE_PREFER_SIZE)
+ thr->valstack_size = DUK_VALSTACK_INITIAL_SIZE;
+#endif
thr->valstack_bottom = thr->valstack;
thr->valstack_top = thr->valstack;
for (i = 0; i < DUK_VALSTACK_INITIAL_SIZE; i++) {
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->valstack[i]);
+ DUK_TVAL_SET_UNDEFINED(&thr->valstack[i]);
}
/* callstack */
@@ -53421,6 +54863,70 @@ DUK_INTERNAL duk_activation *duk_hthread_get_current_activation(duk_hthread *thr
return NULL;
}
}
+
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+DUK_INTERNAL duk_uint_fast32_t duk_hthread_get_act_curr_pc(duk_hthread *thr, duk_activation *act) {
+ duk_instr_t *bcode;
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(act != NULL);
+ DUK_UNREF(thr);
+
+ /* XXX: store 'bcode' pointer to activation for faster lookup? */
+ if (act->func && DUK_HOBJECT_IS_COMPILEDFUNCTION(act->func)) {
+ bcode = DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, (duk_hcompiledfunction *) (act->func));
+ return (duk_uint_fast32_t) (act->curr_pc - bcode);
+ }
+ return 0;
+}
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
+
+DUK_INTERNAL duk_uint_fast32_t duk_hthread_get_act_prev_pc(duk_hthread *thr, duk_activation *act) {
+ duk_instr_t *bcode;
+ duk_uint_fast32_t ret;
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(act != NULL);
+ DUK_UNREF(thr);
+
+ if (act->func && DUK_HOBJECT_IS_COMPILEDFUNCTION(act->func)) {
+ bcode = DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, (duk_hcompiledfunction *) (act->func));
+ ret = (duk_uint_fast32_t) (act->curr_pc - bcode);
+ if (ret > 0) {
+ ret--;
+ }
+ return ret;
+ }
+ return 0;
+}
+
+/* Write bytecode executor's curr_pc back to topmost activation (if any). */
+DUK_INTERNAL void duk_hthread_sync_currpc(duk_hthread *thr) {
+ duk_activation *act;
+
+ DUK_ASSERT(thr != NULL);
+
+ if (thr->ptr_curr_pc != NULL) {
+ /* ptr_curr_pc != NULL only when bytecode executor is active. */
+ DUK_ASSERT(thr->callstack_top > 0);
+ act = thr->callstack + thr->callstack_top - 1;
+ act->curr_pc = *thr->ptr_curr_pc;
+ }
+}
+
+DUK_INTERNAL void duk_hthread_sync_and_null_currpc(duk_hthread *thr) {
+ duk_activation *act;
+
+ DUK_ASSERT(thr != NULL);
+
+ if (thr->ptr_curr_pc != NULL) {
+ /* ptr_curr_pc != NULL only when bytecode executor is active. */
+ DUK_ASSERT(thr->callstack_top > 0);
+ act = thr->callstack + thr->callstack_top - 1;
+ act->curr_pc = *thr->ptr_curr_pc;
+ thr->ptr_curr_pc = NULL;
+ }
+}
#line 1 "duk_hthread_stacks.c"
/*
* Manipulation of thread stacks (valstack, callstack, catchstack).
@@ -53930,7 +55436,7 @@ DUK_LOCAL void duk__interrupt_fixup(duk_hthread *thr, duk_hthread *entry_curr_th
DUK_ASSERT(thr != NULL);
DUK_ASSERT(thr->heap != NULL);
-#if 0
+#if defined(DUK_USE_INTERRUPT_DEBUG_FIXUP)
if (entry_curr_thread == NULL) {
thr->interrupt_init = thr->interrupt_init - thr->interrupt_counter;
thr->heap->inst_count_interrupt += thr->interrupt_init;
@@ -54518,44 +56024,45 @@ void duk__coerce_effective_this_binding(duk_hthread *thr,
duk_hobject *func,
duk_idx_t idx_this) {
duk_context *ctx = (duk_context *) thr;
- duk_small_int_t strict;
+ duk_tval *tv_this;
+ duk_hobject *obj_global;
- if (func) {
- strict = DUK_HOBJECT_HAS_STRICT(func);
- } else {
+ if (func == NULL || DUK_HOBJECT_HAS_STRICT(func)) {
/* Lightfuncs are always considered strict. */
- strict = 1;
+ DUK_DDD(DUK_DDDPRINT("this binding: strict -> use directly"));
+ return;
}
- if (strict) {
- DUK_DDD(DUK_DDDPRINT("this binding: strict -> use directly"));
- } else {
- duk_tval *tv_this = duk_require_tval(ctx, idx_this);
- duk_hobject *obj_global;
-
- if (DUK_TVAL_IS_OBJECT(tv_this)) {
- DUK_DDD(DUK_DDDPRINT("this binding: non-strict, object -> use directly"));
- } else if (DUK_TVAL_IS_LIGHTFUNC(tv_this)) {
- /* Lightfuncs are treated like objects and not coerced. */
- DUK_DDD(DUK_DDDPRINT("this binding: non-strict, lightfunc -> use directly"));
- } else if (DUK_TVAL_IS_UNDEFINED(tv_this) || DUK_TVAL_IS_NULL(tv_this)) {
- DUK_DDD(DUK_DDDPRINT("this binding: non-strict, undefined/null -> use global object"));
- obj_global = thr->builtins[DUK_BIDX_GLOBAL];
- if (obj_global) {
- duk_push_hobject(ctx, obj_global);
- } else {
- /*
- * This may only happen if built-ins are being "torn down".
- * This behavior is out of specification scope.
- */
- DUK_D(DUK_DPRINT("this binding: wanted to use global object, but it is NULL -> using undefined instead"));
- duk_push_undefined(ctx);
- }
- duk_replace(ctx, idx_this);
+ /* XXX: byte offset */
+ tv_this = thr->valstack_bottom + idx_this;
+ switch (DUK_TVAL_GET_TAG(tv_this)) {
+ case DUK_TAG_OBJECT:
+ case DUK_TAG_LIGHTFUNC: /* lightfuncs are treated like objects and not coerced */
+ DUK_DDD(DUK_DDDPRINT("this binding: non-strict, object -> use directly"));
+ break;
+ case DUK_TAG_UNDEFINED:
+ case DUK_TAG_NULL:
+ DUK_DDD(DUK_DDDPRINT("this binding: non-strict, undefined/null -> use global object"));
+ obj_global = thr->builtins[DUK_BIDX_GLOBAL];
+ /* XXX: avoid this check somehow */
+ if (DUK_LIKELY(obj_global != NULL)) {
+ DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_this)); /* no need to decref previous value */
+ DUK_TVAL_SET_OBJECT(tv_this, obj_global);
+ DUK_HOBJECT_INCREF(thr, obj_global);
} else {
- DUK_DDD(DUK_DDDPRINT("this binding: non-strict, not object/undefined/null -> use ToObject(value)"));
- duk_to_object(ctx, idx_this); /* may have side effects */
+ /* This may only happen if built-ins are being "torn down".
+ * This behavior is out of specification scope.
+ */
+ DUK_D(DUK_DPRINT("this binding: wanted to use global object, but it is NULL -> using undefined instead"));
+ DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_this)); /* no need to decref previous value */
+ DUK_TVAL_SET_UNDEFINED(tv_this); /* nothing to incref */
}
+ break;
+ default:
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv_this));
+ DUK_DDD(DUK_DDDPRINT("this binding: non-strict, not object/undefined/null -> use ToObject(value)"));
+ duk_to_object(ctx, idx_this); /* may have side effects */
+ break;
}
}
@@ -54689,11 +56196,11 @@ void duk__adjust_valstack_and_top(duk_hthread *thr, duk_idx_t num_stack_args, du
* for errhandler calls
* DUK_CALL_FLAG_CONSTRUCTOR_CALL <--> for 'new Foo()' calls
*
- * Input stack:
+ * Input stack (thr):
*
* [ func this arg1 ... argN ]
*
- * Output stack:
+ * Output stack (thr):
*
* [ retval ] (DUK_EXEC_SUCCESS)
* [ errobj ] (DUK_EXEC_ERROR (normal error), protected call)
@@ -54705,7 +56212,7 @@ void duk__adjust_valstack_and_top(duk_hthread *thr, duk_idx_t num_stack_args, du
* indices) cause an error to propagate out of this function. If there is
* no catchpoint for this error, the fatal error handler is called.
*
- * See 'execution.txt'.
+ * See 'execution.rst'.
*
* The allowed thread states for making a call are:
* - thr matches heap->curr_thread, and thr is already RUNNING
@@ -54717,7 +56224,7 @@ void duk__adjust_valstack_and_top(duk_hthread *thr, duk_idx_t num_stack_args, du
* avoiding a dozen helpers with awkward plumbing.
*
* Note: setjmp() and local variables have a nasty interaction,
- * see execution.txt; non-volatile locals modified after setjmp()
+ * see execution.rst; non-volatile locals modified after setjmp()
* call are not guaranteed to keep their value.
*/
@@ -54733,9 +56240,10 @@ duk_int_t duk_handle_call(duk_hthread *thr,
duk_int_t entry_call_recursion_depth;
duk_hthread *entry_curr_thread;
duk_uint_fast8_t entry_thread_state;
+ duk_instr_t **entry_ptr_curr_pc;
volatile duk_bool_t need_setjmp;
duk_jmpbuf * volatile old_jmpbuf_ptr = NULL; /* ptr is volatile (not the target) */
- volatile duk_idx_t idx_func; /* valstack index of 'func' and retval (relative to entry valstack_bottom) */
+ duk_idx_t idx_func; /* valstack index of 'func' and retval (relative to entry valstack_bottom) */
duk_idx_t idx_args; /* valstack index of start of args (arg1) (relative to entry valstack_bottom) */
duk_idx_t nargs; /* # argument registers target function wants (< 0 => "as is") */
duk_idx_t nregs; /* # total registers target function wants on entry (< 0 => "as is") */
@@ -54745,7 +56253,6 @@ duk_int_t duk_handle_call(duk_hthread *thr,
duk_activation *act;
duk_hobject *env;
duk_jmpbuf our_jmpbuf;
- duk_tval tv_tmp;
duk_int_t retval = DUK_EXEC_ERROR;
duk_ret_t rc;
@@ -54768,12 +56275,19 @@ duk_int_t duk_handle_call(duk_hthread *thr,
*/
entry_valstack_bottom_index = (duk_size_t) (thr->valstack_bottom - thr->valstack);
+#if defined(DUK_USE_PREFER_SIZE)
entry_valstack_end = (duk_size_t) (thr->valstack_end - thr->valstack);
+#else
+ DUK_ASSERT((duk_size_t) (thr->valstack_end - thr->valstack) == thr->valstack_size);
+ entry_valstack_end = thr->valstack_size;
+#endif
entry_callstack_top = thr->callstack_top;
entry_catchstack_top = thr->catchstack_top;
entry_call_recursion_depth = thr->heap->call_recursion_depth;
entry_curr_thread = thr->heap->curr_thread; /* Note: may be NULL if first call */
entry_thread_state = thr->state;
+ entry_ptr_curr_pc = thr->ptr_curr_pc; /* may be NULL */
+
idx_func = duk_normalize_index(ctx, -num_stack_args - 2); /* idx_func must be valid, note: non-throwing! */
idx_args = idx_func + 2; /* idx_args is not necessarily valid if num_stack_args == 0 (idx_args then equals top) */
@@ -54806,6 +56320,12 @@ duk_int_t duk_handle_call(duk_hthread *thr,
(void *) entry_curr_thread,
(long) entry_thread_state));
+ /* If thr->ptr_curr_pc is set, sync curr_pc to act->pc. Then NULL
+ * thr->ptr_curr_pc so that it's not accidentally used with an incorrect
+ * activation when side effects occur.
+ */
+ duk_hthread_sync_and_null_currpc(thr);
+
/* XXX: Multiple tv_func lookups are now avoided by making a local
* copy of tv_func. Another approach would be to compute an offset
* for tv_func from valstack bottom and recomputing the tv_func
@@ -54867,6 +56387,11 @@ duk_int_t duk_handle_call(duk_hthread *thr,
DUK_ASSERT(thr->callstack_top >= entry_callstack_top);
DUK_ASSERT(thr->catchstack_top >= entry_catchstack_top);
+ /* We don't need to sync back thr->curr_pc here because the
+ * bytecode executor always has a setjmp catchpoint which
+ * does that before errors propagate to here.
+ */
+
/*
* Restore previous setjmp catchpoint
*/
@@ -54897,6 +56422,9 @@ duk_int_t duk_handle_call(duk_hthread *thr,
DUK_DDD(DUK_DDDPRINT("call is not protected -> clean up and rethrow"));
+ /* Restore entry thread executor curr_pc stack frame pointer. */
+ thr->ptr_curr_pc = entry_ptr_curr_pc;
+
DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread); /* may be NULL */
thr->state = entry_thread_state;
DUK_ASSERT((thr->state == DUK_HTHREAD_STATE_INACTIVE && thr->heap->curr_thread == NULL) || /* first call */
@@ -55118,7 +56646,7 @@ duk_int_t duk_handle_call(duk_hthread *thr,
#ifdef DUK_USE_NONSTD_FUNC_CALLER_PROPERTY
act->prev_caller = NULL;
#endif
- act->pc = 0;
+ act->curr_pc = NULL;
#if defined(DUK_USE_DEBUGGER_SUPPORT)
act->prev_line = 0;
#endif
@@ -55197,6 +56725,7 @@ duk_int_t duk_handle_call(duk_hthread *thr,
/* [... func this arg1 ... argN envobj] */
+ act = thr->callstack + thr->callstack_top - 1;
act->lex_env = env;
act->var_env = env;
DUK_HOBJECT_INCREF(thr, env);
@@ -55261,6 +56790,9 @@ duk_int_t duk_handle_call(duk_hthread *thr,
* other invalid
*/
+ /* For native calls must be NULL so we don't sync back */
+ DUK_ASSERT(thr->ptr_curr_pc == NULL);
+
if (func) {
rc = ((duk_hnativefunction *) func)->func((duk_context *) thr);
} else {
@@ -55347,6 +56879,10 @@ duk_int_t duk_handle_call(duk_hthread *thr,
* Shift to new valstack_bottom.
*/
+ DUK_ASSERT(func != NULL);
+ DUK_ASSERT(DUK_HOBJECT_HAS_COMPILEDFUNCTION(func));
+ act->curr_pc = DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, (duk_hcompiledfunction *) func);
+
thr->valstack_bottom = thr->valstack_bottom + idx_args;
/* keep current valstack_top */
DUK_ASSERT(thr->valstack_bottom >= thr->valstack);
@@ -55368,6 +56904,8 @@ duk_int_t duk_handle_call(duk_hthread *thr,
*
*/
+ /* thr->ptr_curr_pc is set by bytecode executor early on entry */
+ DUK_ASSERT(thr->ptr_curr_pc == NULL);
DUK_DDD(DUK_DDDPRINT("entering bytecode execution"));
duk_js_execute_bytecode(thr);
DUK_DDD(DUK_DDDPRINT("returned from bytecode execution"));
@@ -55456,17 +56994,15 @@ duk_int_t duk_handle_call(duk_hthread *thr,
* runs etc capture even out-of-memory errors so nothing should
* throw here.
*/
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value1);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->heap->lj.value1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
-
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value2);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->heap->lj.value2);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value1); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value2); /* side effects */
DUK_DDD(DUK_DDDPRINT("setjmp catchpoint torn down"));
}
+ /* Restore entry thread executor curr_pc stack frame pointer. */
+ thr->ptr_curr_pc = entry_ptr_curr_pc;
+
DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread); /* may be NULL */
thr->state = (duk_uint8_t) entry_thread_state;
@@ -55476,6 +57012,24 @@ duk_int_t duk_handle_call(duk_hthread *thr,
thr->heap->call_recursion_depth = entry_call_recursion_depth;
+ /* If the debugger is active we need to force an interrupt so that
+ * debugger breakpoints are rechecked. This is important for function
+ * calls caused by side effects (e.g. when doing a DUK_OP_GETPROP), see
+ * GH-303. Only needed for success path, error path always causes a
+ * breakpoint recheck in the executor. It would be enough to set this
+ * only when returning to an Ecmascript activation, but setting the flag
+ * on every return should have no ill effect.
+ */
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+ if (DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap)) {
+ DUK_DD(DUK_DDPRINT("returning to ecmascript activation with debugger enabled, force interrupt"));
+ DUK_ASSERT(thr->interrupt_counter <= thr->interrupt_init);
+ thr->interrupt_init -= thr->interrupt_counter;
+ thr->interrupt_counter = 0;
+ thr->heap->dbg_force_restart = 1;
+ }
+#endif
+
#if defined(DUK_USE_INTERRUPT_COUNTER) && defined(DUK_USE_DEBUG)
duk__interrupt_fixup(thr, entry_curr_thread);
#endif
@@ -55599,9 +57153,9 @@ duk_int_t duk_handle_safe_call(duk_hthread *thr,
duk_int_t entry_call_recursion_depth;
duk_hthread *entry_curr_thread;
duk_uint_fast8_t entry_thread_state;
+ duk_instr_t **entry_ptr_curr_pc;
duk_jmpbuf *old_jmpbuf_ptr = NULL;
duk_jmpbuf our_jmpbuf;
- duk_tval tv_tmp;
duk_idx_t idx_retbase;
duk_int_t retval;
duk_ret_t rc;
@@ -55616,6 +57170,7 @@ duk_int_t duk_handle_safe_call(duk_hthread *thr,
entry_call_recursion_depth = thr->heap->call_recursion_depth;
entry_curr_thread = thr->heap->curr_thread; /* Note: may be NULL if first call */
entry_thread_state = thr->state;
+ entry_ptr_curr_pc = thr->ptr_curr_pc; /* may be NULL */
idx_retbase = duk_get_top(ctx) - num_stack_args; /* Note: not a valid stack index if num_stack_args == 0 */
/* Note: cannot portably debug print a function pointer, hence 'func' not printed! */
@@ -55825,16 +57380,14 @@ duk_int_t duk_handle_safe_call(duk_hthread *thr,
* runs etc capture even out-of-memory errors so nothing should
* throw here.
*/
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value1);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->heap->lj.value1);
- DUK_TVAL_DECREF(thr, &tv_tmp);
-
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value2);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->heap->lj.value2);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value1); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value2); /* side effects */
DUK_DDD(DUK_DDDPRINT("setjmp catchpoint torn down"));
+ /* Restore entry thread executor curr_pc stack frame pointer. */
+ thr->ptr_curr_pc = entry_ptr_curr_pc;
+
/* XXX: because we unwind stacks above, thr->heap->curr_thread is at
* risk of pointing to an already freed thread. This was indeed the
* case in test-bug-multithread-valgrind.c, until duk_handle_call()
@@ -55853,6 +57406,10 @@ duk_int_t duk_handle_safe_call(duk_hthread *thr,
/* stack discipline consistency check */
DUK_ASSERT(duk_get_top(ctx) == idx_retbase + num_stack_rets);
+ /* A debugger forced interrupt check is not needed here, as
+ * problematic safe calls are not caused by side effects.
+ */
+
#if defined(DUK_USE_INTERRUPT_COUNTER) && defined(DUK_USE_DEBUG)
duk__interrupt_fixup(thr, entry_curr_thread);
#endif
@@ -55906,6 +57463,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
duk_activation *act;
duk_hobject *env;
duk_bool_t use_tailcall;
+ duk_instr_t **entry_ptr_curr_pc;
DUK_ASSERT(thr != NULL);
DUK_ASSERT(ctx != NULL);
@@ -55921,7 +57479,15 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
(thr->state == DUK_HTHREAD_STATE_RUNNING &&
thr->heap->curr_thread == thr));
- /* if a tailcall:
+ /* If thr->ptr_curr_pc is set, sync curr_pc to act->pc. Then NULL
+ * thr->ptr_curr_pc so that it's not accidentally used with an incorrect
+ * activation when side effects occur. If we end up not making the
+ * call we must restore the value.
+ */
+ entry_ptr_curr_pc = thr->ptr_curr_pc;
+ duk_hthread_sync_and_null_currpc(thr);
+
+ /* if a tail call:
* - an Ecmascript activation must be on top of the callstack
* - there cannot be any active catchstack entries
*/
@@ -55991,6 +57557,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
func = duk__nonbound_func_lookup(ctx, idx_func, &num_stack_args, &tv_func, call_flags);
if (func == NULL || !DUK_HOBJECT_IS_COMPILEDFUNCTION(func)) {
DUK_DDD(DUK_DDDPRINT("final target is a lightfunc/nativefunc, cannot do ecma-to-ecma call"));
+ thr->ptr_curr_pc = entry_ptr_curr_pc;
return 0;
}
/* XXX: tv_func is not actually needed */
@@ -56012,7 +57579,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
/*
* Preliminary activation record and valstack manipulation.
* The concrete actions depend on whether the we're dealing
- * with a tailcall (reuse an existing activation), a resume,
+ * with a tail call (reuse an existing activation), a resume,
* or a normal call.
*
* The basic actions, in varying order, are:
@@ -56043,17 +57610,16 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
act = thr->callstack + thr->callstack_top - 1;
if (act->flags & DUK_ACT_FLAG_PREVENT_YIELD) {
/* See: test-bug-tailcall-preventyield-assert.c. */
- DUK_DDD(DUK_DDDPRINT("tailcall prevented by current activation having DUK_ACT_FLAG_PREVENTYIELD"));
+ DUK_DDD(DUK_DDDPRINT("tail call prevented by current activation having DUK_ACT_FLAG_PREVENTYIELD"));
use_tailcall = 0;
} else if (DUK_HOBJECT_HAS_NOTAIL(func)) {
- DUK_D(DUK_DPRINT("tailcall prevented by function having a notail flag"));
+ DUK_D(DUK_DPRINT("tail call prevented by function having a notail flag"));
use_tailcall = 0;
}
}
if (use_tailcall) {
duk_tval *tv1, *tv2;
- duk_tval tv_tmp;
duk_size_t cs_index;
duk_int_t i_stk; /* must be signed for loop structure */
duk_idx_t i_arg;
@@ -56065,10 +57631,10 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
* the current activation (or simulate an unwind). In particular, the
* current activation must be closed, otherwise something like
* test-bug-reduce-judofyr.js results. Also catchstack needs be unwound
- * because there may be non-error-catching label entries in valid tailcalls.
+ * because there may be non-error-catching label entries in valid tail calls.
*/
- DUK_DDD(DUK_DDDPRINT("is tailcall, reusing activation at callstack top, at index %ld",
+ DUK_DDD(DUK_DDDPRINT("is tail call, reusing activation at callstack top, at index %ld",
(long) (thr->callstack_top - 1)));
/* 'act' already set above */
@@ -56104,7 +57670,10 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
#ifdef DUK_USE_NONSTD_FUNC_CALLER_PROPERTY
act->prev_caller = NULL;
#endif
- act->pc = 0; /* don't want an intermediate exposed state with invalid pc */
+ DUK_ASSERT(func != NULL);
+ DUK_ASSERT(DUK_HOBJECT_HAS_COMPILEDFUNCTION(func));
+ /* don't want an intermediate exposed state with invalid pc */
+ act->curr_pc = DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, (duk_hcompiledfunction *) func);
#if defined(DUK_USE_DEBUGGER_SUPPORT)
act->prev_line = 0;
#endif
@@ -56116,7 +57685,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
#ifdef DUK_USE_NONSTD_FUNC_CALLER_PROPERTY
#ifdef DUK_USE_TAILCALL
-#error incorrect options: tailcalls enabled with function caller property
+#error incorrect options: tail calls enabled with function caller property
#endif
/* XXX: this doesn't actually work properly for tail calls, so
* tail calls are disabled when DUK_USE_NONSTD_FUNC_CALLER_PROPERTY
@@ -56133,7 +57702,6 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
DUK_ASSERT(DUK_ACT_GET_FUNC(act) == func); /* already updated */
DUK_ASSERT(act->var_env == NULL); /* already NULLed (by unwind) */
DUK_ASSERT(act->lex_env == NULL); /* already NULLed (by unwind) */
- DUK_ASSERT(act->pc == 0); /* already zeroed */
act->idx_bottom = entry_valstack_bottom_index; /* tail call -> reuse current "frame" */
DUK_ASSERT(nregs >= 0);
#if 0 /* topmost activation idx_retval is considered garbage, no need to init */
@@ -56148,7 +57716,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
* [ ... this_old | (crud) func this_new arg1 ... argN ]
* --> [ ... this_new | arg1 ... argN ]
*
- * For tailcalling to work properly, the valstack bottom must not grow
+ * For tail calling to work properly, the valstack bottom must not grow
* here; otherwise crud would accumulate on the valstack.
*/
@@ -56156,10 +57724,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
tv2 = thr->valstack_bottom + idx_func + 1;
DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top); /* tv1 is -below- valstack_bottom */
DUK_ASSERT(tv2 >= thr->valstack_bottom && tv2 < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
for (i_arg = 0; i_arg < idx_args; i_arg++) {
/* XXX: block removal API primitive */
@@ -56173,7 +57738,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
/* [ ... this_new | arg1 ... argN ] */
} else {
- DUK_DDD(DUK_DDDPRINT("not a tailcall, pushing a new activation to callstack, to index %ld",
+ DUK_DDD(DUK_DDDPRINT("not a tail call, pushing a new activation to callstack, to index %ld",
(long) (thr->callstack_top)));
duk_hthread_callstack_grow(thr);
@@ -56208,7 +57773,9 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
#ifdef DUK_USE_NONSTD_FUNC_CALLER_PROPERTY
act->prev_caller = NULL;
#endif
- act->pc = 0;
+ DUK_ASSERT(func != NULL);
+ DUK_ASSERT(DUK_HOBJECT_HAS_COMPILEDFUNCTION(func));
+ act->curr_pc = DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, (duk_hcompiledfunction *) func);
#if defined(DUK_USE_DEBUGGER_SUPPORT)
act->prev_line = 0;
#endif
@@ -56279,6 +57846,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
/* [... arg1 ... argN envobj] */
+ act = thr->callstack + thr->callstack_top - 1;
act->lex_env = env;
act->var_env = env;
DUK_HOBJECT_INCREF(thr, act->lex_env);
@@ -56336,7 +57904,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
* Recursion limits are in key functions to prevent arbitrary C recursion:
* function body parsing, statement parsing, and expression parsing.
*
- * See doc/compiler.txt for discussion on the design.
+ * See doc/compiler.rst for discussion on the design.
*
* A few typing notes:
*
@@ -56465,10 +58033,11 @@ duk_regconst_t duk__ivalue_toregconst_raw(duk_compiler_ctx *comp_ctx,
duk_small_uint_t flags);
DUK_LOCAL_DECL duk_reg_t duk__ivalue_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
#if 0 /* unused */
-DUK_LOCAL_DECL duk_reg_t duk__ivalue_totempreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
+DUK_LOCAL_DECL duk_reg_t duk__ivalue_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
#endif
DUK_LOCAL_DECL void duk__ivalue_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x, duk_int_t forced_reg);
DUK_LOCAL_DECL duk_regconst_t duk__ivalue_toregconst(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
+DUK_LOCAL_DECL duk_regconst_t duk__ivalue_totempconst(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
/* identifier handling */
DUK_LOCAL_DECL duk_reg_t duk__lookup_active_register_binding(duk_compiler_ctx *comp_ctx);
@@ -56491,17 +58060,22 @@ DUK_LOCAL_DECL void duk__expr(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_s
DUK_LOCAL_DECL void duk__exprtop(duk_compiler_ctx *ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
/* convenience helpers */
+#if 0 /* unused */
DUK_LOCAL_DECL duk_reg_t duk__expr_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
+#endif
#if 0 /* unused */
-DUK_LOCAL_DECL duk_reg_t duk__expr_totempreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
+DUK_LOCAL_DECL duk_reg_t duk__expr_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
#endif
DUK_LOCAL_DECL void duk__expr_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags, duk_reg_t forced_reg);
DUK_LOCAL_DECL duk_regconst_t duk__expr_toregconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
+#if 0 /* unused */
+DUK_LOCAL_DECL duk_regconst_t duk__expr_totempconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
+#endif
DUK_LOCAL_DECL void duk__expr_toplain(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
DUK_LOCAL_DECL void duk__expr_toplain_ignore(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
DUK_LOCAL_DECL duk_reg_t duk__exprtop_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
#if 0 /* unused */
-DUK_LOCAL_DECL duk_reg_t duk__exprtop_totempreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
+DUK_LOCAL_DECL duk_reg_t duk__exprtop_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
#endif
DUK_LOCAL_DECL void duk__exprtop_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags, duk_reg_t forced_reg);
DUK_LOCAL_DECL duk_regconst_t duk__exprtop_toregconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
@@ -56551,7 +58125,7 @@ DUK_LOCAL_DECL duk_int_t duk__parse_func_like_fnum(duk_compiler_ctx *comp_ctx, d
/* XXX: actually single step levels would work just fine, clean up */
-/* binding power "levels" (see doc/compiler.txt) */
+/* binding power "levels" (see doc/compiler.rst) */
#define DUK__BP_INVALID 0 /* always terminates led() */
#define DUK__BP_EOF 2
#define DUK__BP_CLOSING 4 /* token closes expression, e.g. ')', ']' */
@@ -56738,7 +58312,7 @@ DUK_LOCAL void duk__advance_helper(duk_compiler_ctx *comp_ctx, duk_small_int_t e
* We can use either 't' or 't_nores'; the latter would not
* recognize keywords. Some keywords can be followed by a
* RegExp (e.g. "return"), so using 't' is better. This is
- * not trivial, see doc/compiler.txt.
+ * not trivial, see doc/compiler.rst.
*/
regexp = 1;
@@ -56848,7 +58422,7 @@ DUK_LOCAL void duk__init_func_valstack_slots(duk_compiler_ctx *comp_ctx) {
func->labelinfos_idx = entry_top + 5;
func->h_labelinfos = (duk_hbuffer_dynamic *) duk_get_hbuffer(ctx, entry_top + 5);
DUK_ASSERT(func->h_labelinfos != NULL);
- DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(func->h_labelinfos));
+ DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(func->h_labelinfos) && !DUK_HBUFFER_HAS_EXTERNAL(func->h_labelinfos));
duk_push_array(ctx);
func->argnames_idx = entry_top + 6;
@@ -56924,9 +58498,9 @@ DUK_LOCAL duk_int_t duk__cleanup_varmap(duk_compiler_ctx *comp_ctx) {
tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, h_varmap, i);
if (!DUK_TVAL_IS_NUMBER(tv)) {
DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv));
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
DUK_HOBJECT_E_SET_KEY(thr->heap, h_varmap, i, NULL);
DUK_HSTRING_DECREF(thr, h_key);
+ /* when key is NULL, value is garbage so no need to set */
} else {
ret++;
}
@@ -58096,11 +59670,35 @@ DUK_LOCAL void duk__peephole_optimize_bytecode(duk_compiler_ctx *comp_ctx) {
* code (it is checked as it is used).
*/
#define DUK__IVAL_FLAG_ALLOW_CONST (1 << 0) /* allow a constant to be returned */
-#define DUK__IVAL_FLAG_REQUIRE_TEMP (1 << 1) /* require a (mutable) temporary as a result */
+#define DUK__IVAL_FLAG_REQUIRE_TEMP (1 << 1) /* require a (mutable) temporary as a result (or a const if allowed) */
#define DUK__IVAL_FLAG_REQUIRE_SHORT (1 << 2) /* require a short (8-bit) reg/const which fits into bytecode B/C slot */
/* XXX: some code might benefit from DUK__SETTEMP_IFTEMP(ctx,x) */
+#if 0 /* enable manually for dumping */
+#define DUK__DUMP_ISPEC(compctx,ispec) do { duk__dump_ispec((compctx), (ispec)); } while (0)
+#define DUK__DUMP_IVALUE(compctx,ivalue) do { duk__dump_ivalue((compctx), (ivalue)); } while (0)
+
+DUK_LOCAL void duk__dump_ispec(duk_compiler_ctx *comp_ctx, duk_ispec *x) {
+ DUK_D(DUK_DPRINT("ispec dump: t=%ld regconst=0x%08lx, valstack_idx=%ld, value=%!T",
+ (long) x->t, (unsigned long) x->regconst, (long) x->valstack_idx,
+ duk_get_tval((duk_context *) comp_ctx->thr, x->valstack_idx)));
+}
+DUK_LOCAL void duk__dump_ivalue(duk_compiler_ctx *comp_ctx, duk_ivalue *x) {
+ DUK_D(DUK_DPRINT("ivalue dump: t=%ld op=%ld "
+ "x1={t=%ld regconst=0x%08lx valstack_idx=%ld value=%!T} "
+ "x2={t=%ld regconst=0x%08lx valstack_idx=%ld value=%!T}",
+ (long) x->t, (long) x->op,
+ (long) x->x1.t, (unsigned long) x->x1.regconst, (long) x->x1.valstack_idx,
+ duk_get_tval((duk_context *) comp_ctx->thr, x->x1.valstack_idx),
+ (long) x->x2.t, (unsigned long) x->x2.regconst, (long) x->x2.valstack_idx,
+ duk_get_tval((duk_context *) comp_ctx->thr, x->x2.valstack_idx)));
+}
+#else
+#define DUK__DUMP_ISPEC(comp_ctx,x) do {} while (0)
+#define DUK__DUMP_IVALUE(comp_ctx,x) do {} while (0)
+#endif
+
DUK_LOCAL void duk__copy_ispec(duk_compiler_ctx *comp_ctx, duk_ispec *src, duk_ispec *dst) {
duk_context *ctx = (duk_context *) comp_ctx->thr;
@@ -58336,6 +59934,7 @@ duk_regconst_t duk__ispec_toregconst_raw(duk_compiler_ctx *comp_ctx,
duk_double_t dval;
duk_int32_t ival;
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
dval = DUK_TVAL_GET_NUMBER(tv);
@@ -58367,26 +59966,34 @@ duk_regconst_t duk__ispec_toregconst_raw(duk_compiler_ctx *comp_ctx,
} /* end switch */
}
case DUK_ISPEC_REGCONST: {
- if ((x->regconst & DUK__CONST_MARKER) && !(flags & DUK__IVAL_FLAG_ALLOW_CONST)) {
- duk_reg_t dest = (forced_reg >= 0 ? forced_reg : DUK__ALLOCTEMP(comp_ctx));
- duk__emit_a_bc(comp_ctx, DUK_OP_LDCONST, (duk_regconst_t) dest, x->regconst);
- return (duk_regconst_t) dest;
- } else {
- if (forced_reg >= 0) {
- if (x->regconst != (duk_regconst_t) forced_reg) {
- duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, forced_reg, x->regconst);
- }
- return (duk_regconst_t) forced_reg;
+ if (forced_reg >= 0) {
+ if (x->regconst & DUK__CONST_MARKER) {
+ duk__emit_a_bc(comp_ctx, DUK_OP_LDCONST, forced_reg, x->regconst);
+ } else if (x->regconst != (duk_regconst_t) forced_reg) {
+ duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, forced_reg, x->regconst);
} else {
- if ((flags & DUK__IVAL_FLAG_REQUIRE_TEMP) && !DUK__ISTEMP(comp_ctx, x->regconst)) {
- duk_reg_t dest = DUK__ALLOCTEMP(comp_ctx);
- duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, (duk_regconst_t) dest, x->regconst);
- return (duk_regconst_t) dest;
- } else {
- return x->regconst;
- }
+ ; /* already in correct reg */
}
+ return (duk_regconst_t) forced_reg;
}
+
+ DUK_ASSERT(forced_reg < 0);
+ if (x->regconst & DUK__CONST_MARKER) {
+ if (!(flags & DUK__IVAL_FLAG_ALLOW_CONST)) {
+ duk_reg_t dest = DUK__ALLOCTEMP(comp_ctx);
+ duk__emit_a_bc(comp_ctx, DUK_OP_LDCONST, (duk_regconst_t) dest, x->regconst);
+ return (duk_regconst_t) dest;
+ }
+ return x->regconst;
+ }
+
+ DUK_ASSERT(forced_reg < 0 && !(x->regconst & DUK__CONST_MARKER));
+ if ((flags & DUK__IVAL_FLAG_REQUIRE_TEMP) && !DUK__ISTEMP(comp_ctx, x->regconst)) {
+ duk_reg_t dest = DUK__ALLOCTEMP(comp_ctx);
+ duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, (duk_regconst_t) dest, x->regconst);
+ return (duk_regconst_t) dest;
+ }
+ return x->regconst;
}
default: {
break;
@@ -58685,7 +60292,7 @@ DUK_LOCAL duk_reg_t duk__ivalue_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x)
}
#if 0 /* unused */
-DUK_LOCAL duk_reg_t duk__ivalue_totempreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x) {
+DUK_LOCAL duk_reg_t duk__ivalue_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *x) {
return duk__ivalue_toregconst_raw(comp_ctx, x, -1, DUK__IVAL_FLAG_REQUIRE_TEMP /*flags*/);
}
#endif
@@ -58699,6 +60306,10 @@ DUK_LOCAL duk_regconst_t duk__ivalue_toregconst(duk_compiler_ctx *comp_ctx, duk_
return duk__ivalue_toregconst_raw(comp_ctx, x, -1, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
}
+DUK_LOCAL duk_regconst_t duk__ivalue_totempconst(duk_compiler_ctx *comp_ctx, duk_ivalue *x) {
+ return duk__ivalue_toregconst_raw(comp_ctx, x, -1, DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_TEMP /*flags*/);
+}
+
/* The issues below can be solved with better flags */
/* XXX: many operations actually want toforcedtemp() -- brand new temp? */
@@ -59663,7 +61274,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
* such that parsing ends at an LPAREN (CallExpression) but not at
* a PERIOD or LBRACKET (MemberExpression).
*
- * See doc/compiler.txt for discussion on the parsing approach,
+ * See doc/compiler.rst for discussion on the parsing approach,
* and testcases/test-dev-new.js for a bunch of documented tests.
*/
@@ -60512,7 +62123,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
* Truthval determines when to skip right-hand-side.
* For logical AND truthval=1, for logical OR truthval=0.
*
- * See doc/compiler.txt for discussion on compiling logical
+ * See doc/compiler.rst for discussion on compiling logical
* AND and OR expressions. The approach here is very simplistic,
* generating extra jumps and multiple evaluations of truth values,
* but generates code on-the-fly with only local back-patching.
@@ -60558,11 +62169,21 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
* Syntactically valid left-hand-side forms which are not accepted as
* left-hand-side values (e.g. as in "f() = 1") must NOT cause a
* SyntaxError, but rather a run-time ReferenceError.
+ *
+ * Assignment expression value is conceptually the LHS/RHS value
+ * copied into a fresh temporary so that it won't change even if
+ * LHS/RHS values change (e.g. when they're identifiers). Doing this
+ * concretely produces inefficient bytecode, so we try to avoid the
+ * extra temporary for some known-to-be-safe cases. Currently the
+ * only safe case we detect is a "top level assignment", for example
+ * "x = y + z;", where the assignment expression value is ignored.
+ * See: test-dev-assign-expr.js and test-bug-assign-mutate-gh381.js.
*/
{
duk_small_uint_t args_op = args >> 8;
duk_small_uint_t args_rbp = args & 0xff;
+ duk_bool_t toplevel_assign;
/* XXX: here we need to know if 'left' is left-hand-side compatible.
* That information is no longer available from current expr parsing
@@ -60570,44 +62191,89 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
* some other means.
*/
+ /* A top-level assignment is e.g. "x = y;". For these it's safe
+ * to use the RHS as-is as the expression value, even if the RHS
+ * is a reg-bound identifier. The RHS ('res') is right associative
+ * so it has consumed all other assignment level operations; the
+ * only relevant lower binding power construct is comma operator
+ * which will ignore the expression value provided here.
+ */
+ toplevel_assign = (comp_ctx->curr_func.nud_count == 1 && /* one token before */
+ comp_ctx->curr_func.led_count == 1); /* one operator (= assign) */
+ DUK_DDD(DUK_DDDPRINT("assignment: nud_count=%ld, led_count=%ld, toplevel_assign=%ld",
+ (long) comp_ctx->curr_func.nud_count,
+ (long) comp_ctx->curr_func.led_count,
+ (long) toplevel_assign));
+
if (left->t == DUK_IVAL_VAR) {
duk_hstring *h_varname;
duk_reg_t reg_varbind;
duk_regconst_t rc_varname;
- duk_regconst_t rc_res;
- duk_reg_t reg_temp;
- /* already in fluly evaluated form */
- DUK_ASSERT(left->x1.t == DUK_ISPEC_VALUE);
+ DUK_ASSERT(left->x1.t == DUK_ISPEC_VALUE); /* LHS is already side effect free */
- duk__expr_toreg(comp_ctx, res, args_rbp /*rbp_flags*/);
- DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST);
+ /* Keep the RHS as an unresolved ivalue for now, so it
+ * can be a plain value or a unary/binary operation here.
+ * We resolve it before finishing but doing it later allows
+ * better bytecode in some cases.
+ */
+ duk__expr(comp_ctx, res, args_rbp /*rbp_flags*/);
h_varname = duk_get_hstring(ctx, left->x1.valstack_idx);
DUK_ASSERT(h_varname != NULL);
-
- /* E5 Section 11.13.1 (and others for other assignments), step 4 */
if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) {
+ /* E5 Section 11.13.1 (and others for other assignments), step 4 */
goto syntax_error_lvalue;
}
-
duk_dup(ctx, left->x1.valstack_idx);
(void) duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname);
- DUK_DDD(DUK_DDDPRINT("assign to '%!O' -> reg_varbind=%ld, rc_varname=%ld",
- (duk_heaphdr *) h_varname, (long) reg_varbind, (long) rc_varname));
-
if (args_op == DUK_OP_NONE) {
- rc_res = res->x1.regconst;
+ if (toplevel_assign) {
+ /* Any 'res' will do. */
+ DUK_DDD(DUK_DDDPRINT("plain assignment, toplevel assign, use as is"));
+ } else {
+ /* 'res' must be a plain ivalue, and not register-bound variable. */
+ DUK_DDD(DUK_DDDPRINT("plain assignment, not toplevel assign, ensure not a reg-bound identifier"));
+ if (res->t != DUK_IVAL_PLAIN || (res->x1.t == DUK_ISPEC_REGCONST &&
+ (res->x1.regconst & DUK__CONST_MARKER) == 0 &&
+ !DUK__ISTEMP(comp_ctx, res->x1.regconst))) {
+ duk__ivalue_totempconst(comp_ctx, res);
+ }
+ }
} else {
- reg_temp = DUK__ALLOCTEMP(comp_ctx);
+ duk__ivalue_toregconst(comp_ctx, res);
+ DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST);
+
if (reg_varbind >= 0) {
+ duk_reg_t reg_res;
+
+ if (toplevel_assign) {
+ /* 'reg_varbind' is the operation result and can also
+ * become the expression value for top level assignments
+ * such as: "var x; x += y;".
+ */
+ reg_res = reg_varbind;
+ } else {
+ /* Not safe to use 'reg_varbind' as assignment expression
+ * value, so go through a temp.
+ */
+ reg_res = DUK__ALLOCTEMP(comp_ctx);
+ }
+
duk__emit_a_b_c(comp_ctx,
args_op,
- (duk_regconst_t) reg_temp,
+ (duk_regconst_t) reg_res,
(duk_regconst_t) reg_varbind,
res->x1.regconst);
+ res->x1.regconst = (duk_regconst_t) reg_res;
} else {
+ /* When LHS is not register bound, always go through a
+ * temporary. No optimization for top level assignment.
+ */
+ duk_reg_t reg_temp;
+ reg_temp = DUK__ALLOCTEMP(comp_ctx);
+
duk__emit_a_bc(comp_ctx,
DUK_OP_GETVAR,
(duk_regconst_t) reg_temp,
@@ -60617,40 +62283,57 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
(duk_regconst_t) reg_temp,
(duk_regconst_t) reg_temp,
res->x1.regconst);
+ res->x1.regconst = (duk_regconst_t) reg_temp;
}
- rc_res = (duk_regconst_t) reg_temp;
+
+ DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST);
}
+ /* At this point 'res' holds the potential expression value.
+ * It can be basically any ivalue here, including a reg-bound
+ * identifier (if code above deems it safe) or a unary/binary
+ * operation. Operations must be resolved to a side effect free
+ * plain value, and the side effects must happen exactly once.
+ */
+
if (reg_varbind >= 0) {
- duk__emit_a_bc(comp_ctx,
- DUK_OP_LDREG,
- (duk_regconst_t) reg_varbind,
- rc_res);
+ if (res->t != DUK_IVAL_PLAIN) {
+ /* Resolve 'res' directly into the LHS binding, and use
+ * that as the expression value if safe. If not safe,
+ * resolve to a temp/const and copy to LHS.
+ */
+ if (toplevel_assign) {
+ duk__ivalue_toforcedreg(comp_ctx, res, (duk_int_t) reg_varbind);
+ } else {
+ duk__ivalue_totempconst(comp_ctx, res);
+ duk__copy_ivalue(comp_ctx, res, left); /* use 'left' as a temp */
+ duk__ivalue_toforcedreg(comp_ctx, left, (duk_int_t) reg_varbind);
+ }
+ } else {
+ /* Use 'res' as the expression value (it's side effect
+ * free and may be a plain value, a register, or a
+ * constant) and write it to the LHS binding too.
+ */
+ duk__copy_ivalue(comp_ctx, res, left); /* use 'left' as a temp */
+ duk__ivalue_toforcedreg(comp_ctx, left, (duk_int_t) reg_varbind);
+ }
} else {
- /* Only a reg fits into 'A' and reg_res may be a const in
- * straight assignment.
+ /* Only a reg fits into 'A' so coerce 'res' into a register
+ * for PUTVAR.
*
* XXX: here the current A/B/C split is suboptimal: we could
* just use 9 bits for reg_res (and support constants) and 17
* instead of 18 bits for the varname const index.
*/
- if (DUK__ISCONST(comp_ctx, rc_res)) {
- reg_temp = DUK__ALLOCTEMP(comp_ctx);
- duk__emit_a_bc(comp_ctx,
- DUK_OP_LDCONST,
- (duk_regconst_t) reg_temp,
- rc_res);
- rc_res = (duk_regconst_t) reg_temp;
- }
+
+ duk__ivalue_toreg(comp_ctx, res);
duk__emit_a_bc(comp_ctx,
DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE,
- rc_res,
+ res->x1.regconst,
rc_varname);
}
- res->t = DUK_IVAL_PLAIN;
- res->x1.t = DUK_ISPEC_REGCONST;
- res->x1.regconst = rc_res;
+ /* 'res' contains expression value */
} else if (left->t == DUK_IVAL_PROP) {
/* E5 Section 11.13.1 (and others) step 4 never matches for prop writes -> no check */
duk_reg_t reg_obj;
@@ -60964,15 +62647,17 @@ DUK_LOCAL void duk__exprtop(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_sma
* Each helper needs at least 2-3 calls to make it worth while to wrap.
*/
+#if 0 /* unused */
DUK_LOCAL duk_reg_t duk__expr_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
duk__expr(comp_ctx, res, rbp_flags);
return duk__ivalue_toreg(comp_ctx, res);
}
+#endif
#if 0 /* unused */
-DUK_LOCAL duk_reg_t duk__expr_totempreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
+DUK_LOCAL duk_reg_t duk__expr_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
duk__expr(comp_ctx, res, rbp_flags);
- return duk__ivalue_totempreg(comp_ctx, res);
+ return duk__ivalue_totemp(comp_ctx, res);
}
#endif
@@ -60987,6 +62672,13 @@ DUK_LOCAL duk_regconst_t duk__expr_toregconst(duk_compiler_ctx *comp_ctx, duk_iv
return duk__ivalue_toregconst(comp_ctx, res);
}
+#if 0 /* unused */
+DUK_LOCAL duk_regconst_t duk__expr_totempconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
+ duk__expr(comp_ctx, res, rbp_flags);
+ return duk__ivalue_totempconst(comp_ctx, res);
+}
+#endif
+
DUK_LOCAL void duk__expr_toplain(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
duk__expr(comp_ctx, res, rbp_flags);
duk__ivalue_toplain(comp_ctx, res);
@@ -61003,9 +62695,9 @@ DUK_LOCAL duk_reg_t duk__exprtop_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *r
}
#if 0 /* unused */
-DUK_LOCAL duk_reg_t duk__exprtop_totempreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
+DUK_LOCAL duk_reg_t duk__exprtop_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
duk__exprtop(comp_ctx, res, rbp_flags);
- return duk__ivalue_totempreg(comp_ctx, res);
+ return duk__ivalue_totemp(comp_ctx, res);
}
#endif
@@ -61172,7 +62864,7 @@ DUK_LOCAL void duk__parse_var_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_int_t pc_label_site) {
duk_hthread *thr = comp_ctx->thr;
duk_context *ctx = (duk_context *) thr;
- duk_int_t pc_v34_lhs; /* start variant 3/4 left-hand-side code (L1 in doc/compiler.txt example) */
+ duk_int_t pc_v34_lhs; /* start variant 3/4 left-hand-side code (L1 in doc/compiler.rst example) */
duk_reg_t temp_reset; /* knock back "next temp" to this whenever possible */
duk_reg_t reg_temps; /* preallocated temporaries (2) for variants 3 and 4 */
@@ -61199,7 +62891,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
* Parsing these without arbitrary lookahead or backtracking is relatively
* tricky but we manage to do so for now.
*
- * See doc/compiler.txt for a detailed discussion of control flow
+ * See doc/compiler.rst for a detailed discussion of control flow
* issues, evaluation order issues, etc.
*/
@@ -61426,7 +63118,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
*
* Variables set before entering here:
*
- * pc_v34_lhs: insert a "JUMP L2" here (see doc/compiler.txt example).
+ * pc_v34_lhs: insert a "JUMP L2" here (see doc/compiler.rst example).
* reg_temps + 0: iteration target value (written to LHS)
* reg_temps + 1: enumerator object
*/
@@ -61441,7 +63133,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
/* First we need to insert a jump in the middle of previously
* emitted code to get the control flow right. No jumps can
- * cross the position where the jump is inserted. See doc/compiler.txt
+ * cross the position where the jump is inserted. See doc/compiler.rst
* for discussion on the intricacies of control flow and side effects
* for variants 3 and 4.
*/
@@ -61556,7 +63248,7 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
* only process the first match before switching to a "propagation" mode
* where case values are no longer evaluated
*
- * See E5 Section 12.11. Also see doc/compiler.txt for compilation
+ * See E5 Section 12.11. Also see doc/compiler.rst for compilation
* discussion.
*/
@@ -61899,12 +63591,6 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
DUK_ERROR(thr, DUK_ERR_SYNTAX_ERROR, DUK_STR_INVALID_RETURN);
}
- /* Use a fast return when possible. A fast return does not cause a longjmp()
- * unnecessarily. A fast return can be done when no TCF catchers are active
- * (this includes 'try' and 'with' statements). Active label catches do not
- * prevent a fast return; they're unwound on return automatically.
- */
-
ret_flags = 0;
if (comp_ctx->curr_token.t == DUK_TOK_SEMICOLON || /* explicit semi follows */
@@ -61926,10 +63612,10 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
pc_after_expr = duk__get_current_pc(comp_ctx);
/* Tail call check: if last opcode emitted was CALL(I), and
- * the context allows it, change the CALL(I) to a tailcall.
- * This doesn't guarantee that a tailcall will be allowed at
+ * the context allows it, change the CALL(I) to a tail call.
+ * This doesn't guarantee that a tail call will be allowed at
* runtime, so the RETURN must still be emitted. (Duktape
- * 0.10.0 avoided this and simulated a RETURN if a tailcall
+ * 0.10.0 avoided this and simulated a RETURN if a tail call
* couldn't be used at runtime; but this didn't work
* correctly with a thread yield/resume, see
* test-bug-tailcall-thread-yield-resume.js for discussion.)
@@ -61940,7 +63626,7 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
* { return 1; }), 2' the last opcode emitted is CALL (no
* bytecode is emitted for '2') but 'rc_val' indicates
* constant '2'. Similarly if '2' is replaced by a register
- * bound variable, no opcodes are emitted but tailcall would
+ * bound variable, no opcodes are emitted but tail call would
* be incorrect.
*
* This is tricky and easy to get wrong. It would be best to
@@ -61985,21 +63671,6 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
ret_flags = DUK_BC_RETURN_FLAG_HAVE_RETVAL;
}
- /* XXX: For now, "fast returns" are disabled. The compiler doesn't track
- * label site depth so when it emits a fast return, it doesn't know whether
- * label sites exist or not. Label sites are emitted for e.g. for loops,
- * so it's probably quite relevant to handle them in the executor's fast
- * return handler.
- */
-#if 0
- if (comp_ctx->curr_func.catch_depth == 0) {
- DUK_DDD(DUK_DDDPRINT("fast return allowed -> use fast return"));
- ret_flags |= DUK_BC_RETURN_FLAG_FAST;
- } else {
- DUK_DDD(DUK_DDDPRINT("fast return not allowed -> use slow return"));
- }
-#endif
-
duk__emit_a_b(comp_ctx,
DUK_OP_RETURN | DUK__EMIT_FLAG_NO_SHUFFLE_A,
(duk_regconst_t) ret_flags /*flags*/,
@@ -62039,7 +63710,7 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
/*
* See the following documentation for discussion:
*
- * doc/execution.txt: control flow details
+ * doc/execution.rst: control flow details
*
* Try, catch, and finally "parts" are Blocks, not Statements, so
* they must always be delimited by curly braces. This is unlike e.g.
@@ -62491,7 +64162,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
*
* https://bugs.ecmascript.org/show_bug.cgi?id=8
*
- * See doc/compiler.txt for details.
+ * See doc/compiler.rst for details.
*/
DUK_DDD(DUK_DDDPRINT("do statement"));
DUK_ASSERT(label_id >= 0);
@@ -62580,13 +64251,13 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
break;
}
case DUK_TOK_DEBUGGER: {
+ duk__advance(comp_ctx);
#if defined(DUK_USE_DEBUGGER_SUPPORT)
DUK_DDD(DUK_DDDPRINT("debugger statement: debugging enabled, emit debugger opcode"));
duk__emit_extraop_only(comp_ctx, DUK_EXTRAOP_DEBUGGER);
#else
DUK_DDD(DUK_DDDPRINT("debugger statement: ignored"));
#endif
- duk__advance(comp_ctx);
stmt_flags = DUK__HAS_TERM;
break;
}
@@ -63477,16 +65148,16 @@ DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expec
* (directly or via a jump)
*/
- DUK_ASSERT(comp_ctx->curr_func.catch_depth == 0); /* fast returns are always OK here */
+ DUK_ASSERT(comp_ctx->curr_func.catch_depth == 0);
if (reg_stmt_value >= 0) {
duk__emit_a_b(comp_ctx,
DUK_OP_RETURN | DUK__EMIT_FLAG_NO_SHUFFLE_A,
- (duk_regconst_t) (DUK_BC_RETURN_FLAG_HAVE_RETVAL | DUK_BC_RETURN_FLAG_FAST) /*flags*/,
+ (duk_regconst_t) DUK_BC_RETURN_FLAG_HAVE_RETVAL /*flags*/,
(duk_regconst_t) reg_stmt_value /*reg*/);
} else {
duk__emit_a_b(comp_ctx,
DUK_OP_RETURN | DUK__EMIT_FLAG_NO_SHUFFLE_A,
- (duk_regconst_t) DUK_BC_RETURN_FLAG_FAST /*flags*/,
+ (duk_regconst_t) 0 /*flags*/,
(duk_regconst_t) 0 /*reg(ignored)*/);
}
@@ -63859,7 +65530,7 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_context *ctx) {
comp_ctx->tok12_idx = entry_top + 2;
comp_ctx->tok21_idx = entry_top + 3;
comp_ctx->tok22_idx = entry_top + 4;
- comp_ctx->recursion_limit = DUK_COMPILER_RECURSION_LIMIT;
+ comp_ctx->recursion_limit = DUK_USE_COMPILER_RECLIMIT;
/* comp_ctx->lex has been pre-initialized by caller: it has been
* zeroed and input/input_length has been set.
@@ -63871,7 +65542,7 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_context *ctx) {
comp_ctx->lex.buf_idx = entry_top + 0;
comp_ctx->lex.buf = (duk_hbuffer_dynamic *) duk_get_hbuffer(ctx, entry_top + 0);
DUK_ASSERT(comp_ctx->lex.buf != NULL);
- DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(comp_ctx->lex.buf));
+ DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(comp_ctx->lex.buf) && !DUK_HBUFFER_HAS_EXTERNAL(comp_ctx->lex.buf));
comp_ctx->lex.token_limit = DUK_COMPILER_TOKEN_LIMIT;
lex_pt->offset = 0;
@@ -64015,22 +65686,24 @@ DUK_INTERNAL void duk_js_compile(duk_hthread *thr, const duk_uint8_t *src_buffer
/* include removed: duk_internal.h */
/*
- * Local declarations
+ * Local declarations.
*/
-DUK_LOCAL_DECL void duk__reconfig_valstack(duk_hthread *thr, duk_size_t act_idx, duk_small_uint_t retval_count);
+DUK_LOCAL_DECL void duk__js_execute_bytecode_inner(duk_hthread *entry_thread, duk_size_t entry_callstack_top);
/*
* Arithmetic, binary, and logical helpers.
*
* Note: there is no opcode for logical AND or logical OR; this is on
* purpose, because the evalution order semantics for them make such
- * opcodes pretty pointless (short circuiting means they are most
- * comfortably implemented as jumps). However, a logical NOT opcode
+ * opcodes pretty pointless: short circuiting means they are most
+ * comfortably implemented as jumps. However, a logical NOT opcode
* is useful.
*
* Note: careful with duk_tval pointers here: they are potentially
- * invalidated by any DECREF and almost any API call.
+ * invalidated by any DECREF and almost any API call. It's still
+ * preferable to work without making a copy but that's not always
+ * possible.
*/
DUK_LOCAL duk_double_t duk__compute_mod(duk_double_t d1, duk_double_t d2) {
@@ -64080,7 +65753,6 @@ DUK_LOCAL void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_
if (DUK_TVAL_IS_FASTINT(tv_x) && DUK_TVAL_IS_FASTINT(tv_y)) {
duk_int64_t v1, v2, v3;
duk_int32_t v3_hi;
- duk_tval tv_tmp;
duk_tval *tv_z;
/* Input values are signed 48-bit so we can detect overflow
@@ -64093,10 +65765,7 @@ DUK_LOCAL void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_
v3_hi = (duk_int32_t) (v3 >> 32);
if (DUK_LIKELY(v3_hi >= -0x8000LL && v3_hi <= 0x7fffLL)) {
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_FASTINT(tv_z, v3);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, v3); /* side effects */
return;
} else {
/* overflow, fall through */
@@ -64106,7 +65775,6 @@ DUK_LOCAL void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_
#endif /* DUK_USE_FASTINT */
if (DUK_TVAL_IS_NUMBER(tv_x) && DUK_TVAL_IS_NUMBER(tv_y)) {
- duk_tval tv_tmp;
duk_tval *tv_z;
du.d = DUK_TVAL_GET_NUMBER(tv_x) + DUK_TVAL_GET_NUMBER(tv_y);
@@ -64114,10 +65782,7 @@ DUK_LOCAL void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_
DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&du));
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_NUMBER(tv_z, du.d);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, du.d); /* side effects */
return;
}
@@ -64170,7 +65835,6 @@ DUK_LOCAL void duk__vm_arith_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tva
*/
duk_context *ctx = (duk_context *) thr;
- duk_tval tv_tmp;
duk_tval *tv_z;
duk_double_t d1, d2;
duk_double_union du;
@@ -64247,10 +65911,7 @@ DUK_LOCAL void duk__vm_arith_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tva
v3_hi = (duk_int32_t) (v3 >> 32);
if (DUK_LIKELY(v3_hi >= -0x8000LL && v3_hi <= 0x7fffLL)) {
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_FASTINT(tv_z, v3);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, v3); /* side effects */
return;
}
/* fall through if overflow etc */
@@ -64303,10 +65964,7 @@ DUK_LOCAL void duk__vm_arith_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tva
DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&du));
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_NUMBER(tv_z, du.d);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, du.d); /* side effects */
}
DUK_LOCAL void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
@@ -64321,7 +65979,6 @@ DUK_LOCAL void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_t
*/
duk_context *ctx = (duk_context *) thr;
- duk_tval tv_tmp;
duk_tval *tv_z;
duk_int32_t i1, i2, i3;
duk_uint32_t u1, u2, u3;
@@ -64409,15 +66066,14 @@ DUK_LOCAL void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_t
#if defined(DUK_USE_FASTINT)
/* Result is always fastint compatible. */
- /* XXX: set 32-bit result (but must handle signed and unsigned) */
+ /* XXX: Set 32-bit result (but must then handle signed and
+ * unsigned results separately).
+ */
fi3 = (duk_int64_t) i3;
fastint_result_set:
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_FASTINT(tv_z, fi3);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, fi3); /* side effects */
#else
d3 = (duk_double_t) i3;
@@ -64426,10 +66082,7 @@ DUK_LOCAL void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_t
DUK_ASSERT_DOUBLE_IS_NORMALIZED(d3); /* always normalized */
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_NUMBER(tv_z, d3);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, d3); /* side effects */
#endif
}
@@ -64510,7 +66163,6 @@ DUK_LOCAL void duk__vm_bitwise_not(duk_hthread *thr, duk_tval *tv_x, duk_small_u
*/
duk_context *ctx = (duk_context *) thr;
- duk_tval tv_tmp;
duk_tval *tv_z;
duk_int32_t i1, i2;
#if !defined(DUK_USE_FASTINT)
@@ -64540,10 +66192,7 @@ DUK_LOCAL void duk__vm_bitwise_not(duk_hthread *thr, duk_tval *tv_x, duk_small_u
#if defined(DUK_USE_FASTINT)
/* Result is always fastint compatible. */
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_FASTINT_I32(tv_z, i2);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_I32_UPDREF(thr, tv_z, i2); /* side effects */
#else
d2 = (duk_double_t) i2;
@@ -64551,10 +66200,7 @@ DUK_LOCAL void duk__vm_bitwise_not(duk_hthread *thr, duk_tval *tv_x, duk_small_u
DUK_ASSERT_DOUBLE_IS_NORMALIZED(d2); /* always normalized */
tv_z = thr->valstack_bottom + idx_z;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_NUMBER(tv_z, d2);
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_z)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, d2); /* side effects */
#endif
}
@@ -64563,7 +66209,6 @@ DUK_LOCAL void duk__vm_logical_not(duk_hthread *thr, duk_tval *tv_x, duk_tval *t
* E5 Section 11.4.9
*/
- duk_tval tv_tmp;
duk_bool_t res;
DUK_ASSERT(thr != NULL);
@@ -64579,37 +66224,35 @@ DUK_LOCAL void duk__vm_logical_not(duk_hthread *thr, duk_tval *tv_x, duk_tval *t
res = duk_js_toboolean(tv_x); /* does not modify tv_x */
DUK_ASSERT(res == 0 || res == 1);
res ^= 1;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_z);
- DUK_TVAL_SET_BOOLEAN(tv_z, res); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv_z, res); /* side effects */
}
/*
- * Longjmp handler for the bytecode executor (and a bunch of static
- * helpers for it).
- *
- * Any type of longjmp() can be caught here, including intra-function
- * longjmp()s like 'break', 'continue', (slow) 'return', 'yield', etc.
+ * Longjmp and other control flow transfer for the bytecode executor.
*
- * Error policy: should not ordinarily throw errors. Errors thrown
- * will bubble outwards.
+ * The longjmp handler can handle all longjmp types: error, yield, and
+ * resume (pseudotypes are never actually thrown).
*
- * Returns:
- * 0 restart execution
- * 1 bytecode executor finished
- * 2 rethrow longjmp
+ * Error policy for longjmp: should not ordinarily throw errors; if errors
+ * occur (e.g. due to out-of-memory) they bubble outwards rather than being
+ * handled recursively.
*/
-/* XXX: duk_api operations for cross-thread reg manipulation? */
-/* XXX: post-condition: value stack must be correct; for ecmascript functions, clamped to 'nregs' */
-
#define DUK__LONGJMP_RESTART 0 /* state updated, restart bytecode execution */
-#define DUK__LONGJMP_FINISHED 1 /* exit bytecode executor with return value */
-#define DUK__LONGJMP_RETHROW 2 /* exit bytecode executor by rethrowing an error to caller */
+#define DUK__LONGJMP_RETHROW 1 /* exit bytecode executor by rethrowing an error to caller */
+
+#define DUK__RETHAND_RESTART 0 /* state updated, restart bytecode execution */
+#define DUK__RETHAND_FINISHED 1 /* exit bytecode execution with return value */
+
+/* XXX: optimize reconfig valstack operations so that resize, clamp, and setting
+ * top are combined into one pass.
+ */
-/* only called when act_idx points to an Ecmascript function */
-DUK_LOCAL void duk__reconfig_valstack(duk_hthread *thr, duk_size_t act_idx, duk_small_uint_t retval_count) {
+/* Reconfigure value stack for return to an Ecmascript function at 'act_idx'. */
+DUK_LOCAL void duk__reconfig_valstack_ecma_return(duk_hthread *thr, duk_size_t act_idx) {
+ duk_activation *act;
duk_hcompiledfunction *h_func;
+ duk_idx_t clamp_top;
DUK_ASSERT(thr != NULL);
DUK_ASSERT_DISABLE(act_idx >= 0); /* unsigned */
@@ -64617,91 +66260,109 @@ DUK_LOCAL void duk__reconfig_valstack(duk_hthread *thr, duk_size_t act_idx, duk_
DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + act_idx)));
DUK_ASSERT_DISABLE(thr->callstack[act_idx].idx_retval >= 0); /* unsigned */
- thr->valstack_bottom = thr->valstack + thr->callstack[act_idx].idx_bottom;
-
- /* clamp so that retval is at the top (retval_count == 1) or register just before
- * intended retval is at the top (retval_count == 0, happens e.g. with 'finally').
+ /* Clamp so that values at 'clamp_top' and above are wiped and won't
+ * retain reachable garbage. Then extend to 'nregs' because we're
+ * returning to an Ecmascript function.
*/
- duk_set_top((duk_context *) thr,
- (duk_idx_t) (thr->callstack[act_idx].idx_retval -
- thr->callstack[act_idx].idx_bottom +
- retval_count));
- /*
- * When returning to an Ecmascript function, extend the valstack
- * top to 'nregs' always.
- */
+ act = thr->callstack + act_idx;
+ h_func = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
- h_func = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(thr->callstack + act_idx);
+ thr->valstack_bottom = thr->valstack + act->idx_bottom;
+ DUK_ASSERT(act->idx_retval >= act->idx_bottom);
+ clamp_top = (duk_idx_t) (act->idx_retval - act->idx_bottom + 1); /* +1 = one retval */
+ duk_set_top((duk_context *) thr, clamp_top);
+ act = NULL;
(void) duk_valstack_resize_raw((duk_context *) thr,
- (thr->valstack_bottom - thr->valstack) + /* bottom of current func */
- h_func->nregs + /* reg count */
- DUK_VALSTACK_INTERNAL_EXTRA, /* + spare */
- DUK_VSRESIZE_FLAG_SHRINK | /* flags */
+ (thr->valstack_bottom - thr->valstack) + /* bottom of current func */
+ h_func->nregs + /* reg count */
+ DUK_VALSTACK_INTERNAL_EXTRA, /* + spare */
+ DUK_VSRESIZE_FLAG_SHRINK | /* flags */
0 /* no compact */ |
DUK_VSRESIZE_FLAG_THROW);
duk_set_top((duk_context *) thr, h_func->nregs);
}
-DUK_LOCAL void duk__handle_catch_or_finally(duk_hthread *thr, duk_size_t cat_idx, duk_bool_t is_finally) {
- duk_context *ctx = (duk_context *) thr;
- duk_tval tv_tmp;
- duk_tval *tv1;
+DUK_LOCAL void duk__reconfig_valstack_ecma_catcher(duk_hthread *thr, duk_size_t act_idx, duk_size_t cat_idx) {
+ duk_activation *act;
+ duk_catcher *cat;
+ duk_hcompiledfunction *h_func;
+ duk_idx_t clamp_top;
- DUK_DDD(DUK_DDDPRINT("handling catch/finally, cat_idx=%ld, is_finally=%ld",
- (long) cat_idx, (long) is_finally));
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT_DISABLE(act_idx >= 0); /* unsigned */
+ DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack + act_idx) != NULL);
+ DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + act_idx)));
+ DUK_ASSERT_DISABLE(thr->callstack[act_idx].idx_retval >= 0); /* unsigned */
- /*
- * Set caught value and longjmp type to catcher regs.
- */
+ act = thr->callstack + act_idx;
+ cat = thr->catchstack + cat_idx;
+ h_func = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
+
+ thr->valstack_bottom = thr->valstack + act->idx_bottom;
+ DUK_ASSERT(cat->idx_base >= act->idx_bottom);
+ clamp_top = (duk_idx_t) (cat->idx_base - act->idx_bottom + 2); /* +2 = catcher value, catcher lj_type */
+ duk_set_top((duk_context *) thr, clamp_top);
+ act = NULL;
+ cat = NULL;
- DUK_DDD(DUK_DDDPRINT("writing catch registers: idx_base=%ld -> %!T, idx_base+1=%ld -> %!T",
- (long) thr->catchstack[cat_idx].idx_base,
- (duk_tval *) &thr->heap->lj.value1,
- (long) (thr->catchstack[cat_idx].idx_base + 1),
- (duk_tval *) &thr->heap->lj.value2));
+ (void) duk_valstack_resize_raw((duk_context *) thr,
+ (thr->valstack_bottom - thr->valstack) + /* bottom of current func */
+ h_func->nregs + /* reg count */
+ DUK_VALSTACK_INTERNAL_EXTRA, /* + spare */
+ DUK_VSRESIZE_FLAG_SHRINK | /* flags */
+ 0 /* no compact */ |
+ DUK_VSRESIZE_FLAG_THROW);
+
+ duk_set_top((duk_context *) thr, h_func->nregs);
+}
+
+/* Set catcher regs: idx_base+0 = value, idx_base+1 = lj_type. */
+DUK_LOCAL void duk__set_catcher_regs(duk_hthread *thr, duk_size_t cat_idx, duk_tval *tv_val_unstable, duk_small_uint_t lj_type) {
+ duk_tval *tv1;
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(tv_val_unstable != NULL);
tv1 = thr->valstack + thr->catchstack[cat_idx].idx_base;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, &thr->heap->lj.value1);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_ASSERT(tv1 < thr->valstack_top);
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv_val_unstable); /* side effects */
tv1 = thr->valstack + thr->catchstack[cat_idx].idx_base + 1;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_NUMBER(tv1, (duk_double_t) thr->heap->lj.type); /* XXX: set int */
- DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv1)); /* no need to incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_ASSERT(tv1 < thr->valstack_top);
- /*
- * Unwind catchstack and callstack.
- *
- * The 'cat_idx' catcher is always kept, even when executing finally.
- */
+#if defined(DUK_USE_FASTINT)
+ DUK_TVAL_SET_FASTINT_U32_UPDREF(thr, tv1, (duk_uint32_t) lj_type); /* side effects */
+#else
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv1, (duk_double_t) lj_type); /* side effects */
+#endif
+}
+
+DUK_LOCAL void duk__handle_catch(duk_hthread *thr, duk_size_t cat_idx, duk_tval *tv_val_unstable, duk_small_uint_t lj_type) {
+ duk_context *ctx;
+ duk_activation *act;
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(tv_val_unstable != NULL);
+ ctx = (duk_context *) thr;
+
+ duk__set_catcher_regs(thr, cat_idx, tv_val_unstable, lj_type);
duk_hthread_catchstack_unwind(thr, cat_idx + 1);
duk_hthread_callstack_unwind(thr, thr->catchstack[cat_idx].callstack_index + 1);
- /*
- * Reconfigure valstack to 'nregs' (this is always the case for
- * Ecmascript functions).
- */
-
DUK_ASSERT(thr->callstack_top >= 1);
DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1) != NULL);
DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1)));
- thr->valstack_bottom = thr->valstack + (thr->callstack + thr->callstack_top - 1)->idx_bottom;
- duk_set_top((duk_context *) thr, ((duk_hcompiledfunction *) DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1))->nregs);
+ duk__reconfig_valstack_ecma_catcher(thr, thr->callstack_top - 1, cat_idx);
- /*
- * Reset PC: resume execution from catch or finally jump slot.
- */
-
- (thr->callstack + thr->callstack_top - 1)->pc =
- thr->catchstack[cat_idx].pc_base + (is_finally ? 1 : 0);
+ DUK_ASSERT(thr->callstack_top >= 1);
+ act = thr->callstack + thr->callstack_top - 1;
+ act->curr_pc = thr->catchstack[cat_idx].pc_base + 0; /* +0 = catch */
+ act = NULL;
/*
* If entering a 'catch' block which requires an automatic
@@ -64713,8 +66374,7 @@ DUK_LOCAL void duk__handle_catch_or_finally(duk_hthread *thr, duk_size_t cat_idx
* which implies the binding is not deletable.
*/
- if (!is_finally && DUK_CAT_HAS_CATCH_BINDING_ENABLED(&thr->catchstack[cat_idx])) {
- duk_activation *act;
+ if (DUK_CAT_HAS_CATCH_BINDING_ENABLED(&thr->catchstack[cat_idx])) {
duk_hobject *new_env;
duk_hobject *act_lex_env;
@@ -64747,7 +66407,7 @@ DUK_LOCAL void duk__handle_catch_or_finally(duk_hthread *thr, duk_size_t cat_idx
DUK_HOBJECT_FLAG_EXTENSIBLE |
DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV),
act_lex_env);
- new_env = duk_require_hobject(ctx, -1);
+ new_env = duk_get_hobject(ctx, -1);
DUK_ASSERT(new_env != NULL);
DUK_DDD(DUK_DDDPRINT("new_env allocated: %!iO", (duk_heaphdr *) new_env));
@@ -64759,7 +66419,7 @@ DUK_LOCAL void duk__handle_catch_or_finally(duk_hthread *thr, duk_size_t cat_idx
DUK_ASSERT(thr->catchstack[cat_idx].h_varname != NULL);
duk_push_hstring(ctx, thr->catchstack[cat_idx].h_varname);
- duk_push_tval(ctx, &thr->heap->lj.value1);
+ duk_push_tval(ctx, thr->valstack + thr->catchstack[cat_idx].idx_base);
duk_xdef_prop(ctx, -3, DUK_PROPDESC_FLAGS_W); /* writable, not configurable */
act = thr->callstack + thr->callstack_top - 1;
@@ -64773,28 +66433,47 @@ DUK_LOCAL void duk__handle_catch_or_finally(duk_hthread *thr, duk_size_t cat_idx
DUK_DDD(DUK_DDDPRINT("new_env finished: %!iO", (duk_heaphdr *) new_env));
}
- if (is_finally) {
- DUK_CAT_CLEAR_FINALLY_ENABLED(&thr->catchstack[cat_idx]);
- } else {
- DUK_CAT_CLEAR_CATCH_ENABLED(&thr->catchstack[cat_idx]);
- }
+ DUK_CAT_CLEAR_CATCH_ENABLED(&thr->catchstack[cat_idx]);
}
-DUK_LOCAL void duk__handle_label(duk_hthread *thr, duk_size_t cat_idx) {
+DUK_LOCAL void duk__handle_finally(duk_hthread *thr, duk_size_t cat_idx, duk_tval *tv_val_unstable, duk_small_uint_t lj_type) {
duk_activation *act;
- /* no callstack changes, no value stack changes */
-
DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(tv_val_unstable != NULL);
+
+ duk__set_catcher_regs(thr, cat_idx, tv_val_unstable, lj_type);
+
+ duk_hthread_catchstack_unwind(thr, cat_idx + 1); /* cat_idx catcher is kept, even for finally */
+ duk_hthread_callstack_unwind(thr, thr->catchstack[cat_idx].callstack_index + 1);
+
DUK_ASSERT(thr->callstack_top >= 1);
+ DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1) != NULL);
+ DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1)));
+
+ duk__reconfig_valstack_ecma_catcher(thr, thr->callstack_top - 1, cat_idx);
+ DUK_ASSERT(thr->callstack_top >= 1);
+ act = thr->callstack + thr->callstack_top - 1;
+ act->curr_pc = thr->catchstack[cat_idx].pc_base + 1; /* +1 = finally */
+ act = NULL;
+
+ DUK_CAT_CLEAR_FINALLY_ENABLED(&thr->catchstack[cat_idx]);
+}
+
+DUK_LOCAL void duk__handle_label(duk_hthread *thr, duk_size_t cat_idx, duk_small_uint_t lj_type) {
+ duk_activation *act;
+
+ DUK_ASSERT(thr != NULL);
+
+ DUK_ASSERT(thr->callstack_top >= 1);
act = thr->callstack + thr->callstack_top - 1;
DUK_ASSERT(DUK_ACT_GET_FUNC(act) != NULL);
DUK_ASSERT(DUK_HOBJECT_HAS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(act)));
/* +0 = break, +1 = continue */
- act->pc = thr->catchstack[cat_idx].pc_base + (thr->heap->lj.type == DUK_LJ_TYPE_CONTINUE ? 1 : 0);
+ act->curr_pc = thr->catchstack[cat_idx].pc_base + (lj_type == DUK_LJ_TYPE_CONTINUE ? 1 : 0);
act = NULL; /* invalidated */
duk_hthread_catchstack_unwind(thr, cat_idx + 1); /* keep label catcher */
@@ -64802,38 +66481,32 @@ DUK_LOCAL void duk__handle_label(duk_hthread *thr, duk_size_t cat_idx) {
/* valstack should not need changes */
#if defined(DUK_USE_ASSERTIONS)
+ DUK_ASSERT(thr->callstack_top >= 1);
act = thr->callstack + thr->callstack_top - 1;
DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack_bottom) ==
(duk_size_t) ((duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act))->nregs);
#endif
}
-/* Note: called for DUK_LJ_TYPE_YIELD and for DUK_LJ_TYPE_RETURN, when a
- * return terminates a thread and yields to the resumer.
+/* Called for handling both a longjmp() with type DUK_LJ_TYPE_YIELD and
+ * when a RETURN opcode terminates a thread and yields to the resumer.
*/
-DUK_LOCAL void duk__handle_yield(duk_hthread *thr, duk_hthread *resumer, duk_size_t act_idx) {
- duk_tval tv_tmp;
+DUK_LOCAL void duk__handle_yield(duk_hthread *thr, duk_hthread *resumer, duk_size_t act_idx, duk_tval *tv_val_unstable) {
duk_tval *tv1;
- /* this may also be called for DUK_LJ_TYPE_RETURN; this is OK as long as
- * lj.value1 is correct.
- */
-
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(resumer != NULL);
+ DUK_ASSERT(tv_val_unstable != NULL);
DUK_ASSERT(DUK_ACT_GET_FUNC(resumer->callstack + act_idx) != NULL);
DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(resumer->callstack + act_idx))); /* resume caller must be an ecmascript func */
- DUK_DDD(DUK_DDDPRINT("resume idx_retval is %ld", (long) resumer->callstack[act_idx].idx_retval));
-
tv1 = resumer->valstack + resumer->callstack[act_idx].idx_retval; /* return value from Duktape.Thread.resume() */
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, &thr->heap->lj.value1);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv_val_unstable); /* side effects */
duk_hthread_callstack_unwind(resumer, act_idx + 1); /* unwind to 'resume' caller */
/* no need to unwind catchstack */
- duk__reconfig_valstack(resumer, act_idx, 1); /* 1 = have retval */
+ duk__reconfig_valstack_ecma_return(resumer, act_idx);
/* caller must change active thread, and set thr->resumer to NULL */
}
@@ -64842,7 +66515,6 @@ DUK_LOCAL
duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
duk_hthread *entry_thread,
duk_size_t entry_callstack_top) {
- duk_tval tv_tmp;
duk_size_t entry_callstack_index;
duk_small_uint_t retval = DUK__LONGJMP_RESTART;
@@ -64855,6 +66527,7 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
/* 'thr' is the current thread, as no-one resumes except us and we
* switch 'thr' in that case.
*/
+ DUK_ASSERT(thr == thr->heap->curr_thread);
/*
* (Re)try handling the longjmp.
@@ -64959,16 +66632,13 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
tv = resumee->valstack + resumee->callstack[act_idx].idx_retval; /* return value from Duktape.Thread.yield() */
DUK_ASSERT(tv >= resumee->valstack && tv < resumee->valstack_top);
tv2 = &thr->heap->lj.value1;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_TVAL(tv, tv2);
- DUK_TVAL_INCREF(thr, tv);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv2); /* side effects */
duk_hthread_callstack_unwind(resumee, act_idx + 1); /* unwind to 'yield' caller */
/* no need to unwind catchstack */
- duk__reconfig_valstack(resumee, act_idx, 1); /* 1 = have retval */
+ duk__reconfig_valstack_ecma_return(resumee, act_idx);
resumee->resumer = thr;
resumee->state = DUK_HTHREAD_STATE_RUNNING;
@@ -64992,7 +66662,7 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
/* resumee: [... initial_func undefined(= this) resume_value ] */
- call_flags = DUK_CALL_FLAG_IS_RESUME; /* is resume, not a tailcall */
+ call_flags = DUK_CALL_FLAG_IS_RESUME; /* is resume, not a tail call */
setup_rc = duk_handle_ecma_call_setup(resumee,
1, /* num_stack_args */
@@ -65068,7 +66738,7 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
DUK_DD(DUK_DDPRINT("-> yield an error, converted to a throw in the resumer, propagate"));
goto check_longjmp;
} else {
- duk__handle_yield(thr, resumer, resumer->callstack_top - 2);
+ duk__handle_yield(thr, resumer, resumer->callstack_top - 2, &thr->heap->lj.value1);
thr->state = DUK_HTHREAD_STATE_YIELDED;
thr->resumer = NULL;
@@ -65086,201 +66756,6 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
break; /* never here */
}
- case DUK_LJ_TYPE_RETURN: {
- /*
- * Four possible outcomes:
- * * A 'finally' in the same function catches the 'return'.
- * (or)
- * * The return happens at the entry level of the bytecode
- * executor, so return from the executor (in C stack).
- * (or)
- * * There is a calling (Ecmascript) activation in the call
- * stack => return to it.
- * (or)
- * * There is no calling activation, and the thread is
- * terminated. There is always a resumer in this case,
- * which gets the return value similarly to a 'yield'
- * (except that the current thread can no longer be
- * resumed).
- */
-
- duk_tval *tv1;
- duk_hthread *resumer;
- duk_catcher *cat;
- duk_size_t orig_callstack_index;
-
- DUK_ASSERT(thr != NULL);
- DUK_ASSERT(thr->callstack_top >= 1);
- DUK_ASSERT(thr->catchstack != NULL);
-
- /* XXX: does not work if thr->catchstack is NULL */
- /* XXX: does not work if thr->catchstack is allocated but lowest pointer */
-
- cat = thr->catchstack + thr->catchstack_top - 1; /* may be < thr->catchstack initially */
- DUK_ASSERT(thr->callstack_top > 0); /* ensures callstack_top - 1 >= 0 */
- orig_callstack_index = thr->callstack_top - 1;
-
- while (cat >= thr->catchstack) {
- if (cat->callstack_index != orig_callstack_index) {
- break;
- }
- if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF &&
- DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
- /* 'finally' catches */
- duk__handle_catch_or_finally(thr,
- cat - thr->catchstack,
- 1); /* is_finally */
-
- DUK_DD(DUK_DDPRINT("-> return caught by a finally (in the same function), restart execution"));
- retval = DUK__LONGJMP_RESTART;
- goto wipe_and_return;
- }
- cat--;
- }
- /* if out of catchstack, cat = thr->catchstack - 1 */
-
- DUK_DD(DUK_DDPRINT("no catcher in catch stack, return to calling activation / yield"));
-
- /* return to calling activation (if any) */
-
- if (thr == entry_thread &&
- thr->callstack_top == entry_callstack_top) {
- /* return to the bytecode executor caller */
-
- duk_push_tval((duk_context *) thr, &thr->heap->lj.value1);
-
- /* [ ... retval ] */
-
- DUK_DD(DUK_DDPRINT("-> return propagated up to entry level, exit bytecode executor"));
- retval = DUK__LONGJMP_FINISHED;
- goto wipe_and_return;
- }
-
- if (thr->callstack_top >= 2) {
- /* there is a caller; it MUST be an Ecmascript caller (otherwise it would
- * match entry level check)
- */
-
- DUK_DDD(DUK_DDDPRINT("slow return to Ecmascript caller, idx_retval=%ld, lj_value1=%!T",
- (long) (thr->callstack + thr->callstack_top - 2)->idx_retval,
- (duk_tval *) &thr->heap->lj.value1));
-
- DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 2))); /* must be ecmascript */
-
- tv1 = thr->valstack + (thr->callstack + thr->callstack_top - 2)->idx_retval;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, &thr->heap->lj.value1);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
-
- DUK_DDD(DUK_DDDPRINT("return value at idx_retval=%ld is %!T",
- (long) (thr->callstack + thr->callstack_top - 2)->idx_retval,
- (duk_tval *) (thr->valstack + (thr->callstack + thr->callstack_top - 2)->idx_retval)));
-
- duk_hthread_catchstack_unwind(thr, (cat - thr->catchstack) + 1); /* leave 'cat' as top catcher (also works if catchstack exhausted) */
- duk_hthread_callstack_unwind(thr, thr->callstack_top - 1);
- duk__reconfig_valstack(thr, thr->callstack_top - 1, 1); /* new top, i.e. callee */
-
- DUK_DD(DUK_DDPRINT("-> return not caught, restart execution in caller"));
- retval = DUK__LONGJMP_RESTART;
- goto wipe_and_return;
- }
-
- DUK_DD(DUK_DDPRINT("no calling activation, thread finishes (similar to yield)"));
-
- DUK_ASSERT(thr->resumer != NULL);
- DUK_ASSERT(thr->resumer->callstack_top >= 2); /* Ecmascript activation + Duktape.Thread.resume() activation */
- DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 1) != NULL &&
- DUK_HOBJECT_IS_NATIVEFUNCTION(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 1)) &&
- ((duk_hnativefunction *) DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 1))->func == duk_bi_thread_resume); /* Duktape.Thread.resume() */
- DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 2) != NULL &&
- DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 2))); /* an Ecmascript function */
- DUK_ASSERT_DISABLE((thr->resumer->callstack + thr->resumer->callstack_top - 2)->idx_retval >= 0); /* unsigned */
- DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING);
- DUK_ASSERT(thr->resumer->state == DUK_HTHREAD_STATE_RESUMED);
-
- resumer = thr->resumer;
-
- duk__handle_yield(thr, resumer, resumer->callstack_top - 2);
-
- duk_hthread_terminate(thr); /* updates thread state, minimizes its allocations */
- DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_TERMINATED);
-
- thr->resumer = NULL;
- resumer->state = DUK_HTHREAD_STATE_RUNNING;
- DUK_HEAP_SWITCH_THREAD(thr->heap, resumer);
-#if 0
- thr = resumer; /* not needed */
-#endif
-
- DUK_DD(DUK_DDPRINT("-> return not caught, thread terminated; handle like yield, restart execution in resumer"));
- retval = DUK__LONGJMP_RESTART;
- goto wipe_and_return;
- }
-
- case DUK_LJ_TYPE_BREAK:
- case DUK_LJ_TYPE_CONTINUE: {
- /*
- * Find a matching label catcher or 'finally' catcher in
- * the same function.
- *
- * A label catcher must always exist and will match unless
- * a 'finally' captures the break/continue first. It is the
- * compiler's responsibility to ensure that labels are used
- * correctly.
- */
-
- duk_catcher *cat;
- duk_size_t orig_callstack_index;
- duk_uint_t lj_label;
-
- cat = thr->catchstack + thr->catchstack_top - 1;
- orig_callstack_index = cat->callstack_index;
-
- DUK_ASSERT(DUK_TVAL_IS_NUMBER(&thr->heap->lj.value1));
- lj_label = (duk_uint_t) DUK_TVAL_GET_NUMBER(&thr->heap->lj.value1);
-
- DUK_DDD(DUK_DDDPRINT("handling break/continue with label=%ld, callstack index=%ld",
- (long) lj_label, (long) cat->callstack_index));
-
- while (cat >= thr->catchstack) {
- if (cat->callstack_index != orig_callstack_index) {
- break;
- }
- DUK_DDD(DUK_DDDPRINT("considering catcher %ld: type=%ld label=%ld",
- (long) (cat - thr->catchstack),
- (long) DUK_CAT_GET_TYPE(cat),
- (long) DUK_CAT_GET_LABEL(cat)));
-
- if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF &&
- DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
- /* finally catches */
- duk__handle_catch_or_finally(thr,
- cat - thr->catchstack,
- 1); /* is_finally */
-
- DUK_DD(DUK_DDPRINT("-> break/continue caught by a finally (in the same function), restart execution"));
- retval = DUK__LONGJMP_RESTART;
- goto wipe_and_return;
- }
- if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_LABEL &&
- (duk_uint_t) DUK_CAT_GET_LABEL(cat) == lj_label) {
- /* found label */
- duk__handle_label(thr,
- cat - thr->catchstack);
-
- DUK_DD(DUK_DDPRINT("-> break/continue caught by a label catcher (in the same function), restart execution"));
- retval = DUK__LONGJMP_RESTART;
- goto wipe_and_return;
- }
- cat--;
- }
-
- /* should never happen, but be robust */
- DUK_D(DUK_DPRINT("break/continue not caught by anything in the current function (should never happen)"));
- goto convert_to_internal_error;
- }
-
case DUK_LJ_TYPE_THROW: {
/*
* Three possible outcomes:
@@ -65312,12 +66787,12 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
}
if (DUK_CAT_HAS_CATCH_ENABLED(cat)) {
- /* try catches */
DUK_ASSERT(DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF);
- duk__handle_catch_or_finally(thr,
- cat - thr->catchstack,
- 0); /* is_finally */
+ duk__handle_catch(thr,
+ cat - thr->catchstack,
+ &thr->heap->lj.value1,
+ DUK_LJ_TYPE_THROW);
DUK_DD(DUK_DDPRINT("-> throw caught by a 'catch' clause, restart execution"));
retval = DUK__LONGJMP_RESTART;
@@ -65328,9 +66803,10 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
DUK_ASSERT(DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF);
DUK_ASSERT(!DUK_CAT_HAS_CATCH_ENABLED(cat));
- duk__handle_catch_or_finally(thr,
- cat - thr->catchstack,
- 1); /* is_finally */
+ duk__handle_finally(thr,
+ cat - thr->catchstack,
+ &thr->heap->lj.value1,
+ DUK_LJ_TYPE_THROW);
DUK_DD(DUK_DDPRINT("-> throw caught by a 'finally' clause, restart execution"));
retval = DUK__LONGJMP_RESTART;
@@ -65355,7 +66831,7 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
/* Note: MUST NOT wipe_and_return here, as heap->lj must remain intact */
}
- DUK_DD(DUK_DDPRINT("not caught by current thread, yield error to resumer"));
+ DUK_DD(DUK_DDPRINT("-> throw not caught by current thread, yield error to resumer and recheck longjmp"));
/* not caught by current thread, thread terminates (yield error to resumer);
* note that this may cause a cascade if the resumer terminates with an uncaught
@@ -65387,11 +66863,10 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
goto check_longjmp;
}
- case DUK_LJ_TYPE_NORMAL: {
- DUK_D(DUK_DPRINT("caught DUK_LJ_TYPE_NORMAL, should never happen, treat as internal error"));
- goto convert_to_internal_error;
- }
-
+ case DUK_LJ_TYPE_BREAK: /* pseudotypes, not used in actual longjmps */
+ case DUK_LJ_TYPE_CONTINUE:
+ case DUK_LJ_TYPE_RETURN:
+ case DUK_LJ_TYPE_NORMAL:
default: {
/* should never happen, but be robust */
DUK_D(DUK_DPRINT("caught unknown longjmp type %ld, treat as internal error", (long) thr->heap->lj.type));
@@ -65407,83 +66882,249 @@ duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
thr->heap->lj.type = DUK_LJ_TYPE_UNKNOWN;
thr->heap->lj.iserror = 0;
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value1);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->heap->lj.value1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
-
- DUK_TVAL_SET_TVAL(&tv_tmp, &thr->heap->lj.value2);
- DUK_TVAL_SET_UNDEFINED_UNUSED(&thr->heap->lj.value2);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value1); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value2); /* side effects */
just_return:
return retval;
convert_to_internal_error:
/* This could also be thrown internally (set the error, goto check_longjmp),
- * but it's better for internal errors to bubble outwards.
+ * but it's better for internal errors to bubble outwards so that we won't
+ * infinite loop in this catchpoint.
*/
DUK_ERROR(thr, DUK_ERR_INTERNAL_ERROR, DUK_STR_INTERNAL_ERROR_EXEC_LONGJMP);
DUK_UNREACHABLE();
return retval;
}
-/* XXX: Disabled for 1.0 release. This needs to handle unwinding for label
- * sites (which are created for explicit labels but also for control statements
- * like for-loops). At that point it's quite close to the "slow return" handler
- * except for longjmp(). Perhaps all returns could initially be handled as fast
- * returns and only converted to longjmp()s when basic handling won't do?
+/* Handle a BREAK/CONTINUE opcode. Avoid using longjmp() for BREAK/CONTINUE
+ * handling because it has a measurable performance impact in ordinary
+ * environments and an extreme impact in Emscripten (GH-342).
*/
-#if 0
-/* Try a fast return. Return false if fails, so that a slow return can be done
- * instead.
+DUK_LOCAL void duk__handle_break_or_continue(duk_hthread *thr,
+ duk_uint_t label_id,
+ duk_small_uint_t lj_type) {
+ duk_catcher *cat;
+ duk_size_t orig_callstack_index;
+
+ DUK_ASSERT(thr != NULL);
+
+ /*
+ * Find a matching label catcher or 'finally' catcher in
+ * the same function.
+ *
+ * A label catcher must always exist and will match unless
+ * a 'finally' captures the break/continue first. It is the
+ * compiler's responsibility to ensure that labels are used
+ * correctly.
+ */
+
+ /* Note: thr->catchstack_top may be 0, so that cat < thr->catchstack
+ * initially. This is OK and intended.
+ */
+ cat = thr->catchstack + thr->catchstack_top - 1;
+ DUK_ASSERT(thr->callstack_top > 0);
+ orig_callstack_index = thr->callstack_top - 1;
+
+ DUK_DDD(DUK_DDDPRINT("handling break/continue with label=%ld, callstack index=%ld",
+ (long) label_id, (long) cat->callstack_index));
+
+ while (cat >= thr->catchstack) {
+ if (cat->callstack_index != orig_callstack_index) {
+ break;
+ }
+ DUK_DDD(DUK_DDDPRINT("considering catcher %ld: type=%ld label=%ld",
+ (long) (cat - thr->catchstack),
+ (long) DUK_CAT_GET_TYPE(cat),
+ (long) DUK_CAT_GET_LABEL(cat)));
+
+ if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF &&
+ DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
+ duk_size_t cat_idx;
+ duk_tval tv_tmp;
+
+ cat_idx = (duk_size_t) (cat - thr->catchstack); /* get before side effects */
+
+#if defined(DUK_USE_FASTINT)
+ DUK_TVAL_SET_FASTINT_U32(&tv_tmp, (duk_uint32_t) label_id);
+#else
+ DUK_TVAL_SET_NUMBER(&tv_tmp, (duk_double_t) label_id);
+#endif
+ duk__handle_finally(thr, cat_idx, &tv_tmp, lj_type);
+
+ DUK_DD(DUK_DDPRINT("-> break/continue caught by 'finally', restart execution"));
+ return;
+ }
+ if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_LABEL &&
+ (duk_uint_t) DUK_CAT_GET_LABEL(cat) == label_id) {
+ duk_size_t cat_idx;
+
+ cat_idx = (duk_size_t) (cat - thr->catchstack);
+ duk__handle_label(thr, cat_idx, lj_type);
+
+ DUK_DD(DUK_DDPRINT("-> break/continue caught by a label catcher (in the same function), restart execution"));
+ return;
+ }
+ cat--;
+ }
+
+ /* should never happen, but be robust */
+ DUK_D(DUK_DPRINT("-> break/continue not caught by anything in the current function (should never happen), throw internal error"));
+ DUK_ERROR(thr, DUK_ERR_INTERNAL_ERROR, DUK_STR_INTERNAL_ERROR);
+ return;
+}
+
+/* Handle a RETURN opcode. Avoid using longjmp() for return handling because
+ * it has a measurable performance impact in ordinary environments and an extreme
+ * impact in Emscripten (GH-342). Return value is on value stack top.
*/
-DUK_LOCAL
-duk_bool_t duk__handle_fast_return(duk_hthread *thr,
- duk_tval *tv_retval,
- duk_hthread *entry_thread,
- duk_size_t entry_callstack_top) {
- duk_tval tv_tmp;
+DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr,
+ duk_hthread *entry_thread,
+ duk_size_t entry_callstack_top) {
duk_tval *tv1;
+ duk_tval *tv2;
+ duk_hthread *resumer;
+ duk_catcher *cat;
+ duk_size_t new_cat_top;
+ duk_size_t orig_callstack_index;
- /* retval == NULL indicates 'undefined' return value */
+ /* We can directly access value stack here. */
- if (thr == entry_thread && thr->callstack_top == entry_callstack_top) {
- DUK_DDD(DUK_DDDPRINT("reject fast return: return would exit bytecode executor to caller"));
- return 0;
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(entry_thread != NULL);
+ DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
+ tv1 = thr->valstack_top - 1;
+ DUK_TVAL_CHKFAST_INPLACE(tv1); /* fastint downgrade check for return values */
+
+ /*
+ * Four possible outcomes:
+ *
+ * 1. A 'finally' in the same function catches the 'return'.
+ * It may continue to propagate when 'finally' is finished,
+ * or it may be neutralized by 'finally' (both handled by
+ * ENDFIN).
+ *
+ * 2. The return happens at the entry level of the bytecode
+ * executor, so return from the executor (in C stack).
+ *
+ * 3. There is a calling (Ecmascript) activation in the call
+ * stack => return to it, in the same executor instance.
+ *
+ * 4. There is no calling activation, and the thread is
+ * terminated. There is always a resumer in this case,
+ * which gets the return value similarly to a 'yield'
+ * (except that the current thread can no longer be
+ * resumed).
+ */
+
+ DUK_ASSERT(thr != NULL);
+ DUK_ASSERT(thr->callstack_top >= 1);
+ DUK_ASSERT(thr->catchstack != NULL);
+
+ /* XXX: does not work if thr->catchstack is NULL */
+ /* XXX: does not work if thr->catchstack is allocated but lowest pointer */
+
+ cat = thr->catchstack + thr->catchstack_top - 1; /* may be < thr->catchstack initially */
+ DUK_ASSERT(thr->callstack_top > 0); /* ensures callstack_top - 1 >= 0 */
+ orig_callstack_index = thr->callstack_top - 1;
+
+ while (cat >= thr->catchstack) {
+ if (cat->callstack_index != orig_callstack_index) {
+ break;
+ }
+ if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF &&
+ DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
+ duk_size_t cat_idx;
+
+ cat_idx = (duk_size_t) (cat - thr->catchstack); /* get before side effects */
+
+ DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
+ duk__handle_finally(thr, cat_idx, thr->valstack_top - 1, DUK_LJ_TYPE_RETURN);
+
+ DUK_DD(DUK_DDPRINT("-> return caught by 'finally', restart execution"));
+ return DUK__RETHAND_RESTART;
+ }
+ cat--;
}
- if (thr->callstack_top <= 1) {
- DUK_DDD(DUK_DDDPRINT("reject fast return: there is no caller in this callstack (thread yield)"));
- return 0;
+ /* If out of catchstack, cat = thr->catchstack - 1;
+ * new_cat_top will be 0 in that case.
+ */
+ new_cat_top = (duk_size_t) ((cat + 1) - thr->catchstack);
+ cat = NULL; /* avoid referencing, invalidated */
+
+ DUK_DDD(DUK_DDDPRINT("no catcher in catch stack, return to calling activation / yield"));
+
+ if (thr == entry_thread &&
+ thr->callstack_top == entry_callstack_top) {
+ /* Return to the bytecode executor caller which will unwind stacks.
+ * Return value is already on the stack top: [ ... retval ].
+ */
+
+ DUK_DDD(DUK_DDDPRINT("-> return propagated up to entry level, exit bytecode executor"));
+ return DUK__RETHAND_FINISHED;
}
- /* There is a caller, and it must be an Ecmascript caller (otherwise
- * it would have matched the entry level check).
- */
- DUK_ASSERT(thr->callstack_top >= 2);
- DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 2))); /* must be ecmascript */
+ if (thr->callstack_top >= 2) {
+ /* There is a caller; it MUST be an Ecmascript caller (otherwise it would
+ * match entry level check)
+ */
- tv1 = thr->valstack + (thr->callstack + thr->callstack_top - 2)->idx_retval;
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- if (tv_retval) {
- DUK_TVAL_SET_TVAL(tv1, tv_retval);
- DUK_TVAL_INCREF(thr, tv1);
- } else {
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv1);
- /* no need to incref */
+ DUK_DDD(DUK_DDDPRINT("return to Ecmascript caller, idx_retval=%ld, lj_value1=%!T",
+ (long) (thr->callstack + thr->callstack_top - 2)->idx_retval,
+ (duk_tval *) &thr->heap->lj.value1));
+
+ DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 2))); /* must be ecmascript */
+
+ tv1 = thr->valstack + (thr->callstack + thr->callstack_top - 2)->idx_retval;
+ DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
+ tv2 = thr->valstack_top - 1;
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
+
+ DUK_DDD(DUK_DDDPRINT("return value at idx_retval=%ld is %!T",
+ (long) (thr->callstack + thr->callstack_top - 2)->idx_retval,
+ (duk_tval *) (thr->valstack + (thr->callstack + thr->callstack_top - 2)->idx_retval)));
+
+ duk_hthread_catchstack_unwind(thr, new_cat_top); /* leave 'cat' as top catcher (also works if catchstack exhausted) */
+ duk_hthread_callstack_unwind(thr, thr->callstack_top - 1);
+ duk__reconfig_valstack_ecma_return(thr, thr->callstack_top - 1);
+
+ DUK_DD(DUK_DDPRINT("-> return not intercepted, restart execution in caller"));
+ return DUK__RETHAND_RESTART;
}
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
- /* No catchstack to unwind. */
+ DUK_DD(DUK_DDPRINT("no calling activation, thread finishes (similar to yield)"));
+
+ DUK_ASSERT(thr->resumer != NULL);
+ DUK_ASSERT(thr->resumer->callstack_top >= 2); /* Ecmascript activation + Duktape.Thread.resume() activation */
+ DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 1) != NULL &&
+ DUK_HOBJECT_IS_NATIVEFUNCTION(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 1)) &&
+ ((duk_hnativefunction *) DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 1))->func == duk_bi_thread_resume); /* Duktape.Thread.resume() */
+ DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 2) != NULL &&
+ DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->resumer->callstack + thr->resumer->callstack_top - 2))); /* an Ecmascript function */
+ DUK_ASSERT_DISABLE((thr->resumer->callstack + thr->resumer->callstack_top - 2)->idx_retval >= 0); /* unsigned */
+ DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING);
+ DUK_ASSERT(thr->resumer->state == DUK_HTHREAD_STATE_RESUMED);
+
+ resumer = thr->resumer;
+
+ /* Share yield longjmp handler. */
+ DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
+ duk__handle_yield(thr, resumer, resumer->callstack_top - 2, thr->valstack_top - 1);
+
+ duk_hthread_terminate(thr); /* updates thread state, minimizes its allocations */
+ DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_TERMINATED);
+
+ thr->resumer = NULL;
+ resumer->state = DUK_HTHREAD_STATE_RUNNING;
+ DUK_HEAP_SWITCH_THREAD(thr->heap, resumer);
#if 0
- duk_hthread_catchstack_unwind(thr, (cat - thr->catchstack) + 1); /* leave 'cat' as top catcher (also works if catchstack exhausted) */
+ thr = resumer; /* not needed */
#endif
- duk_hthread_callstack_unwind(thr, thr->callstack_top - 1);
- duk__reconfig_valstack(thr, thr->callstack_top - 1, 1); /* new top, i.e. callee */
- DUK_DDD(DUK_DDDPRINT("fast return accepted"));
- return 1;
+ DUK_DD(DUK_DDPRINT("-> return not caught, thread terminated; handle like yield, restart execution in resumer"));
+ return DUK__RETHAND_RESTART;
}
-#endif
/*
* Executor interrupt handling
@@ -65544,9 +67185,6 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
line = duk_debug_curr_line(thr);
if (act->prev_line != line) {
- DUK_DDD(DUK_DDDPRINT("PC=%ld line=%ld; line transition: %ld -> %ld",
- (long) act->pc, (long) line, (long) act->prev_line, (long) line));
-
/* Stepped? Step out is handled by callstack unwind. */
if ((thr->heap->dbg_step_type == DUK_STEP_TYPE_INTO ||
thr->heap->dbg_step_type == DUK_STEP_TYPE_OVER) &&
@@ -65560,9 +67198,16 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
}
/* Check for breakpoints only on line transition.
- * Breakpoint is triggered when we enter or cross
- * the target line, and the previous line was within
- * the same function.
+ * Breakpoint is triggered when we enter the target
+ * line from a different line, and the previous line
+ * was within the same function.
+ *
+ * This condition is tricky: the condition used to be
+ * that transition to -or across- the breakpoint line
+ * triggered the breakpoint. This seems intuitively
+ * better because it handles breakpoints on lines with
+ * no emitted opcodes; but this leads to the issue
+ * described in: https://github.com/svaarala/duktape/issues/263.
*/
bp_active = thr->heap->dbg_breakpoints_active;
for (;;) {
@@ -65570,8 +67215,9 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
if (bp == NULL) {
break;
}
+
DUK_ASSERT(bp->filename != NULL);
- if (act->prev_line < bp->line && line >= bp->line) {
+ if (act->prev_line != bp->line && line == bp->line) {
DUK_D(DUK_DPRINT("BREAKPOINT TRIGGERED at %!O:%ld",
(duk_heaphdr *) bp->filename, (long) bp->line));
@@ -65579,7 +67225,7 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
}
}
} else {
- DUK_DDD(DUK_DDDPRINT("PC=%ld line=%ld", (long) act->pc, (long) line));
+ ;
}
act->prev_line = line;
@@ -65716,9 +67362,19 @@ DUK_LOCAL duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
/*
* Avoid nested calls. Concretely this happens during debugging, e.g.
* when we eval() an expression.
+ *
+ * Also don't interrupt if we're currently doing debug processing
+ * (which can be initiated outside the bytecode executor) as this
+ * may cause the debugger to be called recursively. Check required
+ * for correct operation of throw intercept and other "exotic" halting
+ * scenarios.
*/
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+ if (DUK_HEAP_HAS_INTERRUPT_RUNNING(thr->heap) || thr->heap->dbg_processing) {
+#else
if (DUK_HEAP_HAS_INTERRUPT_RUNNING(thr->heap)) {
+#endif
DUK_DD(DUK_DDPRINT("nested executor interrupt, ignoring"));
/* Set a high interrupt counter; the original executor
@@ -65731,8 +67387,10 @@ DUK_LOCAL duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
DUK_HEAP_SET_INTERRUPT_RUNNING(thr->heap);
act = thr->callstack + thr->callstack_top - 1;
+
fun = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
DUK_ASSERT(DUK_HOBJECT_HAS_COMPILEDFUNCTION((duk_hobject *) fun));
+
DUK_UNREF(fun);
#if defined(DUK_USE_EXEC_TIMEOUT_CHECK)
@@ -65773,14 +67431,12 @@ DUK_LOCAL duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
ctr = 1;
}
- DUK_DDD(DUK_DDDPRINT("executor interrupt finished, cstop=%ld, pc=%ld, nextctr=%ld",
- (long) thr->callstack_top, (long) act->pc, (long) ctr));
-
/* The counter value is one less than the init value: init value should
* indicate how many instructions are executed before interrupt. To
* execute 1 instruction (after interrupt handler return), counter must
* be 0.
*/
+ DUK_ASSERT(ctr >= 1);
thr->interrupt_init = ctr;
thr->interrupt_counter = ctr - 1;
DUK_HEAP_CLEAR_INTERRUPT_RUNNING(thr->heap);
@@ -65799,7 +67455,7 @@ DUK_LOCAL duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
*/
#if defined(DUK_USE_DEBUGGER_SUPPORT)
-DUK_LOCAL void duk__executor_handle_debugger(duk_hthread *thr, duk_activation *act, duk_hcompiledfunction *fun) {
+DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *act, duk_hcompiledfunction *fun) {
duk_heap *heap;
duk_tval *tv_tmp;
duk_hstring *filename;
@@ -65935,15 +67591,15 @@ DUK_LOCAL void duk__executor_handle_debugger(duk_hthread *thr, duk_activation *a
* setjmp() jmpbuf.
*
* Ecmascript function calls and coroutine resumptions are handled
- * internally without recursive C calls. Other function calls are
- * handled using duk_handle_call(), increasing C recursion depth.
- *
- * There are many other tricky control flow situations, such as:
+ * internally (by the outer executor function) without recursive C calls.
+ * Other function calls are handled using duk_handle_call(), increasing
+ * C recursion depth.
*
- * - Break and continue (fast and slow)
- * - Return (fast and slow)
- * - Error throwing
- * - Thread resume and yield
+ * Abrupt completions (= long control tranfers) are handled either
+ * directly by reconfiguring relevant stacks and restarting execution,
+ * or via a longjmp. Longjmp-free handling is preferable for performance
+ * (especially Emscripten performance), and is used for: break, continue,
+ * and return.
*
* For more detailed notes, see doc/execution.rst.
*
@@ -65951,11 +67607,19 @@ DUK_LOCAL void duk__executor_handle_debugger(duk_hthread *thr, duk_activation *a
* and volatile.
*/
-#define DUK__STRICT() (DUK_HOBJECT_HAS_STRICT(&(fun)->obj))
-#define DUK__REG(x) (thr->valstack_bottom[(x)])
-#define DUK__REGP(x) (&thr->valstack_bottom[(x)])
-#define DUK__CONST(x) (DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, fun)[(x)])
-#define DUK__CONSTP(x) (&DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, fun)[(x)])
+/* Presence of 'fun' is config based, there's a marginal performance
+ * difference and the best option is architecture dependent.
+ */
+#if defined(DUK_USE_EXEC_FUN_LOCAL)
+#define DUK__FUN() fun
+#else
+#define DUK__FUN() ((duk_hcompiledfunction *) DUK_ACT_GET_FUNC((thr)->callstack + (thr)->callstack_top - 1))
+#endif
+#define DUK__STRICT() (DUK_HOBJECT_HAS_STRICT((duk_hobject *) DUK__FUN()))
+#define DUK__REG(x) (*(thr->valstack_bottom + (x)))
+#define DUK__REGP(x) (thr->valstack_bottom + (x))
+#define DUK__CONST(x) (*(consts + (x)))
+#define DUK__CONSTP(x) (consts + (x))
#define DUK__REGCONST(x) ((x) < DUK_BC_REGLIMIT ? DUK__REG((x)) : DUK__CONST((x) - DUK_BC_REGLIMIT))
#define DUK__REGCONSTP(x) ((x) < DUK_BC_REGLIMIT ? DUK__REGP((x)) : DUK__CONSTP((x) - DUK_BC_REGLIMIT))
@@ -65969,46 +67633,29 @@ DUK_LOCAL void duk__executor_handle_debugger(duk_hthread *thr, duk_activation *a
} while (0)
#endif
-DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
- /* Entry level info. Although these are assigned to before setjmp()
- * a 'volatile' seems to be needed. Note placement of "volatile" for
- * pointers. See doc/code-issues.rst for more discussion.
- */
- duk_hthread * volatile entry_thread; /* volatile copy of exec_thr */
- volatile duk_size_t entry_callstack_top;
- volatile duk_int_t entry_call_recursion_depth;
- duk_jmpbuf * volatile entry_jmpbuf_ptr;
-
- /* "hot" variables for interpretation -- not volatile, value not guaranteed in setjmp error handling */
- duk_hthread *thr; /* stable */
- duk_activation *act; /* semi-stable (ok as long as callstack not resized) */
- duk_hcompiledfunction *fun; /* stable */
- duk_instr_t *bcode; /* stable */
- /* 'consts' is computed on-the-fly */
- /* 'funcs' is quite rarely used, so no local for it */
+#define DUK__SYNC_CURR_PC() do { \
+ duk_activation *act; \
+ act = thr->callstack + thr->callstack_top - 1; \
+ act->curr_pc = curr_pc; \
+ } while (0)
+#define DUK__SYNC_AND_NULL_CURR_PC() do { \
+ duk_activation *act; \
+ act = thr->callstack + thr->callstack_top - 1; \
+ act->curr_pc = curr_pc; \
+ thr->ptr_curr_pc = NULL; \
+ } while (0)
- /* "hot" temps for interpretation -- not volatile, value not guaranteed in setjmp error handling */
- duk_uint_fast32_t ins; /* XXX: check performance impact on x64 between fast/non-fast variant */
+/* Outer executor with setjmp/longjmp handling. */
+DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
+ /* Entry level info. */
+ duk_hthread *entry_thread;
+ duk_size_t entry_callstack_top;
+ duk_int_t entry_call_recursion_depth;
+ duk_jmpbuf *entry_jmpbuf_ptr;
- /* jmpbuf */
+ duk_heap *heap;
duk_jmpbuf jmpbuf;
-#ifdef DUK_USE_INTERRUPT_COUNTER
- duk_int_t int_ctr;
-#endif
-
-#ifdef DUK_USE_ASSERTIONS
- duk_size_t valstack_top_base; /* valstack top, should match before interpreting each op (no leftovers) */
-#endif
-
- /* XXX: document assumptions on setjmp and volatile variables
- * (see duk_handle_call()).
- */
-
- /*
- * Preliminaries
- */
-
DUK_ASSERT(exec_thr != NULL);
DUK_ASSERT(exec_thr->heap != NULL);
DUK_ASSERT(exec_thr->heap->curr_thread != NULL);
@@ -66017,143 +67664,119 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_ASSERT(DUK_ACT_GET_FUNC(exec_thr->callstack + exec_thr->callstack_top - 1) != NULL);
DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(exec_thr->callstack + exec_thr->callstack_top - 1)));
- entry_thread = exec_thr; /* volatile copy */
- thr = (duk_hthread *) entry_thread;
- entry_callstack_top = thr->callstack_top;
- entry_call_recursion_depth = thr->heap->call_recursion_depth;
- entry_jmpbuf_ptr = thr->heap->lj.jmpbuf_ptr;
+ entry_thread = exec_thr;
+ heap = entry_thread->heap;
+ entry_callstack_top = entry_thread->callstack_top;
+ entry_call_recursion_depth = entry_thread->heap->call_recursion_depth;
+ entry_jmpbuf_ptr = entry_thread->heap->lj.jmpbuf_ptr;
/*
- * Setjmp catchpoint setup.
- *
* Note: we currently assume that the setjmp() catchpoint is
* not re-entrant (longjmp() cannot be called more than once
* for a single setjmp()).
+ *
+ * See doc/code-issues.rst for notes on variable assignment
+ * before and after setjmp().
*/
- reset_setjmp_catchpoint:
+ for (;;) {
+ heap->lj.jmpbuf_ptr = &jmpbuf;
+ DUK_ASSERT(heap->lj.jmpbuf_ptr != NULL);
- DUK_ASSERT(thr != NULL);
- thr->heap->lj.jmpbuf_ptr = &jmpbuf;
- DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL);
+ if (DUK_SETJMP(heap->lj.jmpbuf_ptr->jb) != 0) {
+ duk_small_uint_t lj_ret;
- if (DUK_SETJMP(thr->heap->lj.jmpbuf_ptr->jb)) {
- /*
- * Note: any local variables accessed here must have their value
- * assigned *before* the setjmp() call, OR they must be declared
- * volatile. Otherwise their value is not guaranteed to be correct.
- *
- * 'thr' might seem to be a risky variable because it is changed
- * for yield and resume. However, yield and resume are handled
- * using longjmp()s.
- */
+ DUK_DDD(DUK_DDDPRINT("longjmp caught by bytecode executor"));
- duk_small_uint_t lj_ret;
+ /* Longjmp callers are required to sync-and-null thr->ptr_curr_pc
+ * before longjmp.
+ */
+ DUK_ASSERT(heap->curr_thread != NULL);
+ DUK_ASSERT(heap->curr_thread->ptr_curr_pc == NULL);
- DUK_DDD(DUK_DDDPRINT("longjmp caught by bytecode executor"));
+ /* XXX: signalling the need to shrink check (only if unwound) */
- /* Relookup 'thr': it's not volatile so its value is not
- * guaranteed. The heap->curr_thread value should always be
- * valid here because longjmp callers don't switch threads,
- * only the longjmp handler does that (even for RESUME and
- * YIELD).
- */
- DUK_ASSERT(entry_thread != NULL);
- thr = entry_thread->heap->curr_thread;
+ /* Must be restored here to handle e.g. yields properly. */
+ heap->call_recursion_depth = entry_call_recursion_depth;
- /* XXX: signalling the need to shrink check (only if unwound) */
+ /* Switch to caller's setjmp() catcher so that if an error occurs
+ * during error handling, it is always propagated outwards instead
+ * of causing an infinite loop in our own handler.
+ */
+ heap->lj.jmpbuf_ptr = (duk_jmpbuf *) entry_jmpbuf_ptr;
- /* Must be restored here to handle e.g. yields properly. */
- thr->heap->call_recursion_depth = entry_call_recursion_depth;
+ lj_ret = duk__handle_longjmp(heap->curr_thread, entry_thread, entry_callstack_top);
- /* Switch to caller's setjmp() catcher so that if an error occurs
- * during error handling, it is always propagated outwards instead
- * of causing an infinite loop in our own handler.
- */
+ if (lj_ret == DUK__LONGJMP_RESTART) {
+ /* Restart bytecode execution, possibly with a changed thread. */
+ ;
+ } else {
+ /* Rethrow error to calling state. */
+ DUK_ASSERT(lj_ret == DUK__LONGJMP_RETHROW);
- DUK_DDD(DUK_DDDPRINT("restore jmpbuf_ptr: %p -> %p",
- (void *) ((thr && thr->heap) ? thr->heap->lj.jmpbuf_ptr : NULL),
- (void *) entry_jmpbuf_ptr));
- thr->heap->lj.jmpbuf_ptr = (duk_jmpbuf *) entry_jmpbuf_ptr;
+ /* Longjmp handling has restored jmpbuf_ptr. */
+ DUK_ASSERT(heap->lj.jmpbuf_ptr == entry_jmpbuf_ptr);
- lj_ret = duk__handle_longjmp(thr, (duk_hthread *) entry_thread, (duk_size_t) entry_callstack_top);
+ /* Thread may have changed, e.g. YIELD converted to THROW. */
+ duk_err_longjmp(heap->curr_thread);
+ DUK_UNREACHABLE();
+ }
+ } else {
+ /* Execute bytecode until returned or longjmp(). */
+ duk__js_execute_bytecode_inner(entry_thread, entry_callstack_top);
- if (lj_ret == DUK__LONGJMP_RESTART) {
- /*
- * Restart bytecode execution, possibly with a changed thread.
- */
- thr = thr->heap->curr_thread;
- goto reset_setjmp_catchpoint;
- } else if (lj_ret == DUK__LONGJMP_RETHROW) {
- /*
- * Rethrow error to calling state.
- */
+ /* Successful return: restore jmpbuf and return to caller. */
+ heap->lj.jmpbuf_ptr = (duk_jmpbuf *) entry_jmpbuf_ptr;
+ return;
+ }
+ }
- /* thread may have changed (e.g. YIELD converted to THROW) */
- thr = thr->heap->curr_thread;
+ DUK_UNREACHABLE();
+}
- DUK_ASSERT(thr->heap->lj.jmpbuf_ptr == entry_jmpbuf_ptr);
+/* Inner executor, performance critical. */
+DUK_LOCAL DUK_NOINLINE void duk__js_execute_bytecode_inner(duk_hthread *entry_thread, duk_size_t entry_callstack_top) {
+ /* Current PC, accessed by other functions through thr->ptr_to_curr_pc.
+ * Critical for performance. It would be safest to make this volatile,
+ * but that eliminates performance benefits; aliasing guarantees
+ * should be enough though.
+ */
+ duk_instr_t *curr_pc; /* bytecode has a stable pointer */
- duk_err_longjmp(thr);
- DUK_UNREACHABLE();
- } else {
- /*
- * Return from bytecode executor with a return value.
- */
- DUK_ASSERT(lj_ret == DUK__LONGJMP_FINISHED);
+ /* Hot variables for interpretation. Critical for performance,
+ * but must add sparingly to minimize register shuffling.
+ */
+ duk_hthread *thr; /* stable */
+ duk_tval *consts; /* stable */
+ duk_uint_fast32_t ins;
+ /* 'funcs' is quite rarely used, so no local for it */
+#if defined(DUK_USE_EXEC_FUN_LOCAL)
+ duk_hcompiledfunction *fun;
+#else
+ /* 'fun' is quite rarely used, so no local for it */
+#endif
- /* XXX: return assertions for valstack, callstack, catchstack */
+#ifdef DUK_USE_INTERRUPT_COUNTER
+ duk_int_t int_ctr;
+#endif
- DUK_ASSERT(thr->heap->lj.jmpbuf_ptr == entry_jmpbuf_ptr);
- return;
- }
- DUK_UNREACHABLE();
- }
+#ifdef DUK_USE_ASSERTIONS
+ duk_size_t valstack_top_base; /* valstack top, should match before interpreting each op (no leftovers) */
+#endif
/*
* Restart execution by reloading thread state.
*
* Note that 'thr' and any thread configuration may have changed,
- * so all local variables are suspect.
+ * so all local variables are suspect and we need to reinitialize.
*
* The number of local variables should be kept to a minimum: if
* the variables are spilled, they will need to be loaded from
* memory anyway.
- */
-
- restart_execution:
-
- /* Lookup current thread; use the volatile 'entry_thread' for this to
- * avoid clobber warnings. (Any valid, reachable 'thr' value would be
- * fine for this, so using 'entry_thread' is just to silence warnings.)
- */
- thr = entry_thread->heap->curr_thread;
- DUK_ASSERT(thr != NULL);
- DUK_ASSERT(thr->callstack_top >= 1);
- DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1) != NULL);
- DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1)));
-
- /* Assume interrupt init/counter are properly initialized here. */
-
- /* assume that thr->valstack_bottom has been set-up before getting here */
- act = thr->callstack + thr->callstack_top - 1;
- fun = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
- DUK_ASSERT(fun != NULL);
- DUK_ASSERT(thr->valstack_top - thr->valstack_bottom == fun->nregs);
- bcode = DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, fun);
-
-#if defined(DUK_USE_DEBUGGER_SUPPORT)
- if (DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap) && !thr->heap->dbg_processing) {
- thr->heap->dbg_processing = 1;
- duk__executor_handle_debugger(thr, act, fun);
- thr->heap->dbg_processing = 0;
- }
-#endif /* DUK_USE_DEBUGGER_SUPPORT */
-
- /* XXX: shrink check flag? */
-
- /*
- * Bytecode interpreter.
+ *
+ * Any 'goto restart_execution;' code path in opcode dispatch must
+ * ensure 'curr_pc' is synced back to act->curr_pc before the goto
+ * takes place.
*
* The interpreter must be very careful with memory pointers, as
* many pointers are not guaranteed to be 'stable' and may be
@@ -66171,43 +67794,83 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
* is not changed (reallocated by growing or shrinking), or
* by any garbage collection invocation (through finalizers)
* - Note in particular that ANY DECREF can invalidate the
- * activation pointer
+ * activation pointer, so for the most part a fresh lookup
+ * is required
*
* The following are not assumed to have stable pointers at all:
* - the value stack (registers) of the current thread
* - the catch stack of the current thread
*
- * See execution.txt for discussion.
+ * See execution.rst for discussion.
*/
+ restart_execution:
+
+ /* Lookup current thread; use the stable 'entry_thread' for this to
+ * avoid clobber warnings. Any valid, reachable 'thr' value would be
+ * fine for this, so using 'entry_thread' is just to silence warnings.
+ */
+ thr = entry_thread->heap->curr_thread;
DUK_ASSERT(thr != NULL);
- DUK_ASSERT(act != NULL);
- DUK_ASSERT(fun != NULL);
- DUK_ASSERT(bcode != NULL);
+ DUK_ASSERT(thr->callstack_top >= 1);
+ DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1) != NULL);
+ DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(DUK_ACT_GET_FUNC(thr->callstack + thr->callstack_top - 1)));
+
+ thr->ptr_curr_pc = &curr_pc;
+
+ /* Relookup and initialize dispatch loop variables. Debugger check. */
+ {
+ duk_activation *act;
+#if !defined(DUK_USE_EXEC_FUN_LOCAL)
+ duk_hcompiledfunction *fun;
+#endif
+
+ /* Assume interrupt init/counter are properly initialized here. */
+ /* Assume that thr->valstack_bottom has been set-up before getting here. */
+
+ act = thr->callstack + thr->callstack_top - 1;
+ fun = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
+ DUK_ASSERT(fun != NULL);
+ DUK_ASSERT(thr->valstack_top - thr->valstack_bottom == fun->nregs);
+ consts = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, fun);
+ DUK_ASSERT(consts != NULL);
+
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+ if (DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap) && !thr->heap->dbg_processing) {
+ thr->heap->dbg_processing = 1;
+ duk__executor_recheck_debugger(thr, act, fun);
+ act = thr->callstack + thr->callstack_top - 1; /* relookup after side effects */
+ thr->heap->dbg_processing = 0;
+ }
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
+
+#ifdef DUK_USE_ASSERTIONS
+ valstack_top_base = (duk_size_t) (thr->valstack_top - thr->valstack);
+#endif
+
+ /* Set up curr_pc for opcode dispatch. */
+ curr_pc = act->curr_pc;
+ }
- DUK_DD(DUK_DDPRINT("restarting execution, thr %p, act %p (idx %ld), fun %p, bcode %p, "
+ DUK_DD(DUK_DDPRINT("restarting execution, thr %p, act idx %ld, fun %p,"
"consts %p, funcs %p, lev %ld, regbot %ld, regtop %ld, catchstack_top=%ld, "
"preventcount=%ld",
(void *) thr,
- (void *) act,
(long) (thr->callstack_top - 1),
- (void *) fun,
- (void *) bcode,
- (void *) DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, fun),
- (void *) DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(thr->heap, fun),
+ (void *) DUK__FUN(),
+ (void *) DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, DUK__FUN()),
+ (void *) DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(thr->heap, DUK__FUN()),
(long) (thr->callstack_top - 1),
(long) (thr->valstack_bottom - thr->valstack),
(long) (thr->valstack_top - thr->valstack),
(long) thr->catchstack_top,
(long) thr->callstack_preventcount));
-#ifdef DUK_USE_ASSERTIONS
- valstack_top_base = (duk_size_t) (thr->valstack_top - thr->valstack);
-#endif
+ /* Dispatch loop. */
for (;;) {
DUK_ASSERT(thr->callstack_top >= 1);
- DUK_ASSERT(thr->valstack_top - thr->valstack_bottom == fun->nregs);
+ DUK_ASSERT(thr->valstack_top - thr->valstack_bottom == DUK__FUN()->nregs);
DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack) == valstack_top_base);
/* Executor interrupt counter check, used to implement breakpoints,
@@ -66216,7 +67879,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
* as fast as possible. The counter is copied back to the heap struct
* whenever a thread switch occurs by the DUK_HEAP_SWITCH_THREAD() macro.
*/
-#ifdef DUK_USE_INTERRUPT_COUNTER
+#if defined(DUK_USE_INTERRUPT_COUNTER)
int_ctr = thr->interrupt_counter;
if (DUK_LIKELY(int_ctr > 0)) {
thr->interrupt_counter = int_ctr - 1;
@@ -66224,59 +67887,76 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/* Trigger at zero or below */
duk_small_uint_t exec_int_ret;
+ /* Write curr_pc back for the debugger. */
+ DUK_ASSERT(thr->callstack_top > 0);
+ {
+ duk_activation *act;
+ act = thr->callstack + thr->callstack_top - 1;
+ act->curr_pc = (duk_instr_t *) curr_pc;
+ }
+
+ /* Force restart caused by a function return; must recheck
+ * debugger breakpoints before checking line transitions,
+ * see GH-303. Restart and then handle interrupt_counter
+ * zero again.
+ */
+#if defined(DUK_USE_DEBUGGER_SUPPORT)
+ if (thr->heap->dbg_force_restart) {
+ DUK_DD(DUK_DDPRINT("dbg_force_restart flag forced restart execution")); /* GH-303 */
+ thr->heap->dbg_force_restart = 0;
+ goto restart_execution;
+ }
+#endif
+
exec_int_ret = duk__executor_interrupt(thr);
if (exec_int_ret == DUK__INT_RESTART) {
+ /* curr_pc synced back above */
goto restart_execution;
}
}
-#endif
+#endif /* DUK_USE_INTERRUPT_COUNTER */
#if defined(DUK_USE_INTERRUPT_COUNTER) && defined(DUK_USE_DEBUG)
+ /* For cross-checking during development: ensure dispatch count
+ * matches cumulative interrupt counter init value sums.
+ */
thr->heap->inst_count_exec++;
#endif
- /* Because ANY DECREF potentially invalidates 'act' now (through
- * finalization), we need to re-lookup 'act' in almost every case.
- *
- * XXX: future work for performance optimization:
- * This is not nice; it would be nice if the program counter was a
- * behind a stable pointer. For instance, put a raw bytecode pointer
- * into duk_hthread struct (not into the callstack); since bytecode
- * has a stable pointer this would work nicely. Whenever a call is
- * made, the bytecode pointer could be backed up as an integer index
- * to the calling activation. Perhaps add a macro for setting up a
- * new activation (same as for setting up / switching threads)?
- */
+#if defined(DUK_USE_ASSERTIONS) || defined(DUK_USE_DEBUG)
+ {
+ duk_activation *act;
+ act = thr->callstack + thr->callstack_top - 1;
+ DUK_ASSERT(curr_pc >= DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, DUK__FUN()));
+ DUK_ASSERT(curr_pc < DUK_HCOMPILEDFUNCTION_GET_CODE_END(thr->heap, DUK__FUN()));
+ DUK_UNREF(act); /* if debugging disabled */
- act = thr->callstack + thr->callstack_top - 1;
- DUK_ASSERT(bcode + act->pc >= DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, fun));
- DUK_ASSERT(bcode + act->pc < DUK_HCOMPILEDFUNCTION_GET_CODE_END(thr->heap, fun));
-
- DUK_DDD(DUK_DDDPRINT("executing bytecode: pc=%ld ins=0x%08lx, op=%ld, valstack_top=%ld/%ld, nregs=%ld --> %!I",
- (long) act->pc,
- (unsigned long) bcode[act->pc],
- (long) DUK_DEC_OP(bcode[act->pc]),
- (long) (thr->valstack_top - thr->valstack),
- (long) (thr->valstack_end - thr->valstack),
- (long) (fun ? fun->nregs : -1),
- (duk_instr_t) bcode[act->pc]));
+ DUK_DDD(DUK_DDDPRINT("executing bytecode: pc=%ld, ins=0x%08lx, op=%ld, valstack_top=%ld/%ld, nregs=%ld --> %!I",
+ (long) (curr_pc - DUK_HCOMPILEDFUNCTION_GET_CODE_BASE(thr->heap, DUK__FUN())),
+ (unsigned long) *curr_pc,
+ (long) DUK_DEC_OP(*curr_pc),
+ (long) (thr->valstack_top - thr->valstack),
+ (long) (thr->valstack_end - thr->valstack),
+ (long) (DUK__FUN() ? DUK__FUN()->nregs : -1),
+ (duk_instr_t) *curr_pc));
+ }
+#endif
#if defined(DUK_USE_ASSERTIONS)
- /* Quite heavy assert: check that valstack is in correctly
- * initialized state. Improper shuffle instructions can
- * write beyond valstack_end so this check catches them in
- * the act.
+ /* Quite heavy assert: check valstack policy. Improper
+ * shuffle instructions can write beyond valstack_top/end
+ * so this check catches them in the act.
*/
{
duk_tval *tv;
tv = thr->valstack_top;
while (tv != thr->valstack_end) {
- DUK_ASSERT(DUK_TVAL_IS_UNDEFINED_UNUSED(tv));
+ DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv));
tv++;
}
}
#endif
- ins = bcode[act->pc++];
+ ins = *curr_pc++;
/* Typing: use duk_small_(u)int_fast_t when decoding small
* opcode fields (op, A, B, C) and duk_(u)int_fast_t when
@@ -66300,52 +67980,39 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_OP_LDREG: {
duk_small_uint_fast_t a;
duk_uint_fast_t bc;
- duk_tval tv_tmp;
duk_tval *tv1, *tv2;
a = DUK_DEC_A(ins); tv1 = DUK__REGP(a);
bc = DUK_DEC_BC(ins); tv2 = DUK__REGP(bc);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2); /* side effects */
break;
}
case DUK_OP_STREG: {
duk_small_uint_fast_t a;
duk_uint_fast_t bc;
- duk_tval tv_tmp;
duk_tval *tv1, *tv2;
a = DUK_DEC_A(ins); tv1 = DUK__REGP(a);
bc = DUK_DEC_BC(ins); tv2 = DUK__REGP(bc);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv2);
- DUK_TVAL_SET_TVAL(tv2, tv1);
- DUK_TVAL_INCREF(thr, tv2);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv2, tv1); /* side effects */
break;
}
case DUK_OP_LDCONST: {
duk_small_uint_fast_t a;
duk_uint_fast_t bc;
- duk_tval tv_tmp;
duk_tval *tv1, *tv2;
a = DUK_DEC_A(ins); tv1 = DUK__REGP(a);
bc = DUK_DEC_BC(ins); tv2 = DUK__CONSTP(bc);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv2); /* may be e.g. string */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2); /* side effects */
break;
}
case DUK_OP_LDINT: {
duk_small_uint_fast_t a;
duk_int_fast_t bc;
- duk_tval tv_tmp;
duk_tval *tv1;
#if defined(DUK_USE_FASTINT)
duk_int32_t val;
@@ -66356,15 +68023,11 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
#if defined(DUK_USE_FASTINT)
a = DUK_DEC_A(ins); tv1 = DUK__REGP(a);
bc = DUK_DEC_BC(ins); val = (duk_int32_t) (bc - DUK_BC_LDINT_BIAS);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_FASTINT_I32(tv1, val);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_I32_UPDREF(thr, tv1, val); /* side effects */
#else
a = DUK_DEC_A(ins); tv1 = DUK__REGP(a);
bc = DUK_DEC_BC(ins); val = (duk_double_t) (bc - DUK_BC_LDINT_BIAS);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_NUMBER(tv1, val);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv1, val); /* side effects */
#endif
break;
}
@@ -66535,11 +68198,15 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
* C -> num args (N)
*/
- /* Note: duk_new() will call the constuctor using duk_handle_call().
+ /* duk_new() will call the constuctor using duk_handle_call().
* A constructor call prevents a yield from inside the constructor,
* even if the constructor is an Ecmascript function.
*/
+ /* Don't need to sync curr_pc here; duk_new() will do that
+ * when it augments the created error.
+ */
+
/* XXX: unnecessary copying of values? Just set 'top' to
* b + c, and let the return handling fix up the stack frame?
*/
@@ -66567,6 +68234,11 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
duk_new(ctx, (duk_idx_t) c); /* [... constructor arg1 ... argN] -> [retval] */
DUK_DDD(DUK_DDDPRINT("NEW -> %!iT", (duk_tval *) duk_get_tval(ctx, -1)));
duk_replace(ctx, (duk_idx_t) idx);
+
+ /* When debugger is enabled, we need to recheck the activation
+ * status after returning. This is now handled by call handling
+ * and heap->dbg_force_restart.
+ */
break;
}
@@ -66644,6 +68316,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_OP_GETVAR: {
duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_uint_fast_t bc = DUK_DEC_BC(ins);
duk_tval *tv1;
@@ -66654,6 +68327,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
name = DUK_TVAL_GET_STRING(tv1);
DUK_ASSERT(name != NULL);
DUK_DDD(DUK_DDDPRINT("GETVAR: '%!O'", (duk_heaphdr *) name));
+ act = thr->callstack + thr->callstack_top - 1;
(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/); /* -> [... val this] */
duk_pop(ctx); /* 'this' binding is not needed here */
@@ -66662,6 +68336,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
}
case DUK_OP_PUTVAR: {
+ duk_activation *act;
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_uint_fast_t bc = DUK_DEC_BC(ins);
duk_tval *tv1;
@@ -66677,11 +68352,13 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
*/
tv1 = DUK__REGP(a); /* val */
+ act = thr->callstack + thr->callstack_top - 1;
duk_js_putvar_activation(thr, act, name, tv1, DUK__STRICT());
break;
}
case DUK_OP_DECLVAR: {
+ duk_activation *act;
duk_context *ctx = (duk_context *) thr;
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_small_uint_fast_t b = DUK_DEC_B(ins);
@@ -66716,6 +68393,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
}
tv1 = duk_get_tval(ctx, -1);
+ act = thr->callstack + thr->callstack_top - 1;
if (duk_js_declvar_activation(thr, act, name, tv1, prop_flags, is_func_decl)) {
/* already declared, must update binding value */
tv1 = duk_get_tval(ctx, -1);
@@ -66727,6 +68405,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
}
case DUK_OP_DELVAR: {
+ duk_activation *act;
duk_context *ctx = (duk_context *) thr;
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_small_uint_fast_t b = DUK_DEC_B(ins);
@@ -66739,6 +68418,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
name = DUK_TVAL_GET_STRING(tv1);
DUK_ASSERT(name != NULL);
DUK_DDD(DUK_DDDPRINT("DELVAR '%!O'", (duk_heaphdr *) name));
+ act = thr->callstack + thr->callstack_top - 1;
rc = duk_js_delvar_activation(thr, act, name);
duk_push_boolean(ctx, rc);
@@ -66758,6 +68438,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
*/
duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
duk_small_uint_fast_t b = DUK_DEC_B(ins);
duk_uint_fast_t idx;
duk_tval *tv1;
@@ -66767,6 +68448,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_ASSERT(DUK_TVAL_IS_STRING(tv1));
name = DUK_TVAL_GET_STRING(tv1);
DUK_ASSERT(name != NULL);
+ act = thr->callstack + thr->callstack_top - 1;
(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/); /* -> [... val this] */
/* Note: target registers a and a+1 may overlap with DUK__REGCONSTP(b)
@@ -66795,6 +68477,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_OP_CLOSURE: {
duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
+ duk_hcompiledfunction *fun;
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_uint_fast_t bc = DUK_DEC_BC(ins);
duk_hobject *fun_temp;
@@ -66804,10 +68488,13 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
*/
DUK_DDD(DUK_DDDPRINT("CLOSURE to target register %ld, fnum %ld (count %ld)",
- (long) a, (long) bc, (long) DUK_HCOMPILEDFUNCTION_GET_FUNCS_COUNT(thr->heap, fun)));
+ (long) a, (long) bc, (long) DUK_HCOMPILEDFUNCTION_GET_FUNCS_COUNT(thr->heap, DUK__FUN())));
DUK_ASSERT_DISABLE(bc >= 0); /* unsigned */
- DUK_ASSERT((duk_uint_t) bc < (duk_uint_t) DUK_HCOMPILEDFUNCTION_GET_FUNCS_COUNT(thr->heap, fun));
+ DUK_ASSERT((duk_uint_t) bc < (duk_uint_t) DUK_HCOMPILEDFUNCTION_GET_FUNCS_COUNT(thr->heap, DUK__FUN()));
+
+ act = thr->callstack + thr->callstack_top - 1;
+ fun = (duk_hcompiledfunction *) DUK_ACT_GET_FUNC(act);
fun_temp = DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(thr->heap, fun)[bc];
DUK_ASSERT(fun_temp != NULL);
DUK_ASSERT(DUK_HOBJECT_IS_COMPILEDFUNCTION(fun_temp));
@@ -67142,7 +68829,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
tmp = duk_js_toboolean(DUK__REGCONSTP(b));
if (tmp == (duk_bool_t) a) {
/* if boolean matches A, skip next inst */
- act->pc++;
+ curr_pc++;
} else {
;
}
@@ -67152,7 +68839,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_OP_JUMP: {
duk_int_fast_t abc = DUK_DEC_ABC(ins);
- act->pc += abc - DUK_BC_JUMP_BIAS;
+ curr_pc += abc - DUK_BC_JUMP_BIAS;
break;
}
@@ -67161,60 +68848,35 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_small_uint_fast_t b = DUK_DEC_B(ins);
/* duk_small_uint_fast_t c = DUK_DEC_C(ins); */
- duk_tval *tv_val;
+ duk_small_uint_t ret_result;
/* A -> flags
* B -> return value reg/const
* C -> currently unused
*/
- /* A fast return avoids full longjmp handling for a set of
- * scenarios which hopefully represents the common cases.
- * The compiler is responsible for emitting fast returns
- * only when they are safe. Currently this means that there
- * is nothing on the catch stack (not even label catchers).
- * The speed advantage of fast returns (avoiding longjmp) is
- * not very high, around 10-15%.
- */
-#if 0 /* XXX: Disabled for 1.0 release */
- if (a & DUK_BC_RETURN_FLAG_FAST) {
- DUK_DDD(DUK_DDDPRINT("FASTRETURN attempt a=%ld b=%ld", (long) a, (long) b));
-
- if (duk__handle_fast_return(thr,
- (a & DUK_BC_RETURN_FLAG_HAVE_RETVAL) ? DUK__REGCONSTP(b) : NULL,
- entry_thread,
- entry_callstack_top)) {
- DUK_DDD(DUK_DDDPRINT("FASTRETURN success a=%ld b=%ld", (long) a, (long) b));
- goto restart_execution;
- }
- }
-#endif
+ DUK__SYNC_AND_NULL_CURR_PC();
- /* No fast return, slow path. */
- DUK_DDD(DUK_DDDPRINT("SLOWRETURN a=%ld b=%ld", (long) a, (long) b));
+ /* duk__handle_return() is guaranteed never to throw, except
+ * for potential out-of-memory situations which will then
+ * propagate out of the executor longjmp handler.
+ */
if (a & DUK_BC_RETURN_FLAG_HAVE_RETVAL) {
- tv_val = DUK__REGCONSTP(b);
-#if defined(DUK_USE_FASTINT)
- /* Explicit check for fastint downgrade. Do
- * it also for consts for now, which is odd
- * but harmless.
- */
- /* XXX: restrict to reg values only? */
-
- DUK_TVAL_CHKFAST_INPLACE(tv_val);
-#endif
- duk_push_tval(ctx, tv_val);
+ duk_push_tval(ctx, DUK__REGCONSTP(b));
} else {
duk_push_undefined(ctx);
}
+ ret_result = duk__handle_return(thr,
+ entry_thread,
+ entry_callstack_top);
+ if (ret_result == DUK__RETHAND_RESTART) {
+ goto restart_execution;
+ }
+ DUK_ASSERT(ret_result == DUK__RETHAND_FINISHED);
- duk_err_setup_heap_ljstate(thr, DUK_LJ_TYPE_RETURN);
-
- DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* in bytecode executor, should always be set */
- duk_err_longjmp(thr);
- DUK_UNREACHABLE();
- break;
+ DUK_DDD(DUK_DDDPRINT("exiting executor after RETURN handling"));
+ return;
}
case DUK_OP_CALL:
@@ -67230,6 +68892,9 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
duk_hobject *obj_func;
duk_bool_t setup_rc;
duk_idx_t num_stack_args;
+#if !defined(DUK_USE_EXEC_FUN_LOCAL)
+ duk_hcompiledfunction *fun;
+#endif
/* A -> flags
* B -> base register for call (base -> func, base+1 -> this, base+2 -> arg1 ... base+2+N-1 -> argN)
@@ -67280,8 +68945,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
call_flags = 0;
if (flag_tailcall) {
- /* We request a tailcall, but in some corner cases
- * call handling can decide that a tailcall is
+ /* We request a tail call, but in some corner cases
+ * call handling can decide that a tail call is
* actually not possible.
* See: test-bug-tailcall-preventyield-assert.c.
*/
@@ -67298,12 +68963,14 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
call_flags);
if (setup_rc) {
- /* Ecma-to-ecma call possible, may or may not be a tailcall.
+ /* Ecma-to-ecma call possible, may or may not be a tail call.
* Avoid C recursion by being clever.
*/
DUK_DDD(DUK_DDDPRINT("ecma-to-ecma call setup possible, restart execution"));
+ /* curr_pc synced by duk_handle_ecma_call_setup() */
goto restart_execution;
}
+ DUK_ASSERT(thr->ptr_curr_pc != NULL); /* restored if ecma-to-ecma setup fails */
DUK_DDD(DUK_DDDPRINT("ecma-to-ecma call not possible, target is native (may be lightfunc)"));
@@ -67313,6 +68980,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
tv_func = DUK__REGP(idx); /* Relookup if relocated */
if (DUK_TVAL_IS_LIGHTFUNC(tv_func)) {
+
call_flags = 0; /* not protected, respect reclimit, not constructor */
/* There is no eval() special handling here: eval() is never
@@ -67327,6 +68995,9 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/* duk_js_call.c is required to restore the stack reserve
* so we only need to reset the top.
*/
+#if !defined(DUK_USE_EXEC_FUN_LOCAL)
+ fun = DUK__FUN();
+#endif
duk_set_top(ctx, (duk_idx_t) fun->nregs);
/* No need to reinit setjmp() catchpoint, as call handling
@@ -67342,9 +69013,9 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/*
* Other cases, use C recursion.
*
- * If a tailcall was requested we ignore it and execute a normal call.
+ * If a tail call was requested we ignore it and execute a normal call.
* Since Duktape 0.11.0 the compiler emits a RETURN opcode even after
- * a tailcall to avoid test-bug-tailcall-thread-yield-resume.js.
+ * a tail call to avoid test-bug-tailcall-thread-yield-resume.js.
*
* Direct eval call: (1) call target (before following bound function
* chain) is the built-in eval() function, and (2) call was made with
@@ -67370,6 +69041,9 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/* duk_js_call.c is required to restore the stack reserve
* so we only need to reset the top.
*/
+#if !defined(DUK_USE_EXEC_FUN_LOCAL)
+ fun = DUK__FUN();
+#endif
duk_set_top(ctx, (duk_idx_t) fun->nregs);
/* No need to reinit setjmp() catchpoint, as call handling
@@ -67377,17 +69051,16 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
*/
}
-#if defined(DUK_USE_DEBUGGER_SUPPORT)
/* When debugger is enabled, we need to recheck the activation
- * status after returning.
+ * status after returning. This is now handled by call handling
+ * and heap->dbg_force_restart.
*/
- goto restart_execution;
-#endif
break;
}
case DUK_OP_TRYCATCH: {
duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
duk_catcher *cat;
duk_tval *tv1;
duk_small_uint_fast_t a;
@@ -67434,6 +69107,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
a = DUK_DEC_A(ins);
bc = DUK_DEC_BC(ins);
+ act = thr->callstack + thr->callstack_top - 1;
DUK_ASSERT(thr->callstack_top >= 1);
/* 'with' target must be created first, in case we run out of memory */
@@ -67515,7 +69189,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_ASSERT(new_env != NULL);
act = thr->callstack + thr->callstack_top - 1; /* relookup (side effects) */
- DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, new_env, act->lex_env);
+ DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, new_env, act->lex_env); /* side effects */
act = thr->callstack + thr->callstack_top - 1; /* relookup (side effects) */
act->lex_env = new_env;
@@ -67525,9 +69199,24 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
;
}
+ /* Registers 'bc' and 'bc + 1' are written in longjmp handling
+ * and if their previous values (which are temporaries) become
+ * unreachable -and- have a finalizer, there'll be a function
+ * call during error handling which is not supported now (GH-287).
+ * Ensure that both 'bc' and 'bc + 1' have primitive values to
+ * guarantee no finalizer calls in error handling. Scrubbing also
+ * ensures finalizers for the previous values run here rather than
+ * later. Error handling related values are also written to 'bc'
+ * and 'bc + 1' but those values never become unreachable during
+ * error handling, so there's no side effect problem even if the
+ * error value has a finalizer.
+ */
+ duk_to_undefined(ctx, bc);
+ duk_to_undefined(ctx, bc + 1);
+
cat = thr->catchstack + thr->catchstack_top - 1; /* relookup (side effects) */
cat->callstack_index = thr->callstack_top - 1;
- cat->pc_base = act->pc; /* pre-incremented, points to first jump slot */
+ cat->pc_base = (duk_instr_t *) curr_pc; /* pre-incremented, points to first jump slot */
cat->idx_base = (duk_size_t) (thr->valstack_bottom - thr->valstack) + bc;
DUK_DDD(DUK_DDDPRINT("TRYCATCH catcher: flags=0x%08lx, callstack_index=%ld, pc_base=%ld, "
@@ -67535,7 +69224,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
(unsigned long) cat->flags, (long) cat->callstack_index,
(long) cat->pc_base, (long) cat->idx_base, (duk_heaphdr *) cat->h_varname));
- act->pc += 2; /* skip jump slots */
+ curr_pc += 2; /* skip jump slots */
break;
}
@@ -67548,7 +69237,6 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_uint_fast_t bc = DUK_DEC_BC(ins);
duk_tval *tv1, *tv2;
- duk_tval tv_tmp;
duk_double_t x, y, z;
/* Two lowest bits of opcode are used to distinguish
@@ -67579,10 +69267,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_TVAL_SET_FASTINT(tv1, y_fi); /* no need for refcount update */
tv2 = DUK__REGP(a);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv2);
z_fi = (ins & DUK_ENC_OP(0x02)) ? x_fi : y_fi;
- DUK_TVAL_SET_FASTINT(tv2, z_fi); /* no need for incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_FASTINT_UPDREF(thr, tv2, z_fi); /* side effects */
break;
}
skip_fastint:
@@ -67614,10 +69300,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
}
tv2 = DUK__REGP(a);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv2);
z = (ins & DUK_ENC_OP(0x02)) ? x : y;
- DUK_TVAL_SET_NUMBER(tv2, z); /* no need for incref */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv2, z); /* side effects */
break;
}
@@ -67627,6 +69311,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_OP_POSTINCV:
case DUK_OP_POSTDECV: {
duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
duk_small_uint_fast_t a = DUK_DEC_A(ins);
duk_uint_fast_t bc = DUK_DEC_BC(ins);
duk_double_t x, y;
@@ -67645,6 +69330,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_ASSERT(DUK_TVAL_IS_STRING(tv1));
name = DUK_TVAL_GET_STRING(tv1);
DUK_ASSERT(name != NULL);
+ act = thr->callstack + thr->callstack_top - 1;
(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/); /* -> [... val this] */
/* XXX: fastint fast path would be very useful here */
@@ -67747,7 +69433,6 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_EXTRAOP_LDTHIS: {
/* Note: 'this' may be bound to any value, not just an object */
duk_uint_fast_t bc = DUK_DEC_BC(ins);
- duk_tval tv_tmp;
duk_tval *tv1, *tv2;
tv1 = DUK__REGP(bc);
@@ -67756,48 +69441,36 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_DDD(DUK_DDDPRINT("LDTHIS: %!T to r%ld", (duk_tval *) tv2, (long) bc));
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_TVAL(tv1, tv2);
- DUK_TVAL_INCREF(thr, tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2); /* side effects */
break;
}
case DUK_EXTRAOP_LDUNDEF: {
duk_uint_fast_t bc = DUK_DEC_BC(ins);
- duk_tval tv_tmp;
duk_tval *tv1;
tv1 = DUK__REGP(bc);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
break;
}
case DUK_EXTRAOP_LDNULL: {
duk_uint_fast_t bc = DUK_DEC_BC(ins);
- duk_tval tv_tmp;
duk_tval *tv1;
tv1 = DUK__REGP(bc);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_NULL(tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_NULL_UPDREF(thr, tv1); /* side effects */
break;
}
case DUK_EXTRAOP_LDTRUE:
case DUK_EXTRAOP_LDFALSE: {
duk_uint_fast_t bc = DUK_DEC_BC(ins);
- duk_tval tv_tmp;
duk_tval *tv1;
duk_small_uint_fast_t bval = (extraop == DUK_EXTRAOP_LDTRUE ? 1 : 0);
tv1 = DUK__REGP(bc);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_BOOLEAN(tv1, bval);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv1, bval); /* side effects */
break;
}
@@ -67849,6 +69522,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_EXTRAOP_TYPEOFID: {
duk_context *ctx = (duk_context *) thr;
+ duk_activation *act;
duk_small_uint_fast_t b = DUK_DEC_B(ins);
duk_small_uint_fast_t c = DUK_DEC_C(ins);
duk_hstring *name;
@@ -67861,6 +69535,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
tv = DUK__REGCONSTP(c); /* XXX: this could be a DUK__CONSTP instead */
DUK_ASSERT(DUK_TVAL_IS_STRING(tv));
name = DUK_TVAL_GET_STRING(tv);
+ act = thr->callstack + thr->callstack_top - 1;
if (duk_js_getvar_activation(thr, act, name, 0 /*throw*/)) {
/* -> [... val this] */
tv = duk_get_tval(ctx, -2);
@@ -67931,7 +69606,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/* [ ... enum ] -> [ ... next_key ] */
DUK_DDD(DUK_DDDPRINT("enum active, next key is %!T, skip jump slot ",
(duk_tval *) duk_get_tval(ctx, -1)));
- act->pc++;;
+ curr_pc++;
} else {
/* [ ... enum ] -> [ ... ] */
DUK_DDD(DUK_DDDPRINT("enum finished, execute jump slot"));
@@ -68015,7 +69690,6 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
case DUK_EXTRAOP_ENDTRY: {
duk_catcher *cat;
- duk_tval tv_tmp;
duk_tval *tv1;
DUK_ASSERT(thr->catchstack_top >= 1);
@@ -68032,16 +69706,16 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
tv1 = thr->valstack + cat->idx_base;
DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
tv1 = NULL;
tv1 = thr->valstack + cat->idx_base + 1;
DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_NUMBER(tv1, (duk_double_t) DUK_LJ_TYPE_NORMAL); /* XXX: set int */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+#if defined(DUK_USE_FASTINT)
+ DUK_TVAL_SET_FASTINT_U32_UPDREF(thr, tv1, (duk_uint32_t) DUK_LJ_TYPE_NORMAL); /* side effects */
+#else
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv1, (duk_double_t) DUK_LJ_TYPE_NORMAL); /* side effects */
+#endif
tv1 = NULL;
DUK_CAT_CLEAR_FINALLY_ENABLED(cat);
@@ -68051,13 +69725,13 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/* no need to unwind callstack */
}
- act->pc = cat->pc_base + 1;
+ curr_pc = cat->pc_base + 1;
break;
}
case DUK_EXTRAOP_ENDCATCH: {
+ duk_activation *act;
duk_catcher *cat;
- duk_tval tv_tmp;
duk_tval *tv1;
DUK_ASSERT(thr->catchstack_top >= 1);
@@ -68067,6 +69741,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
cat = thr->catchstack + thr->catchstack_top - 1;
DUK_ASSERT(!DUK_CAT_HAS_CATCH_ENABLED(cat)); /* cleared before entering catch part */
+ act = thr->callstack + thr->callstack_top - 1;
+
if (DUK_CAT_HAS_LEXENV_ACTIVE(cat)) {
duk_hobject *prev_env;
@@ -68088,16 +69764,16 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
tv1 = thr->valstack + cat->idx_base;
DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_UNDEFINED_ACTUAL(tv1);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
tv1 = NULL;
tv1 = thr->valstack + cat->idx_base + 1;
DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv1);
- DUK_TVAL_SET_NUMBER(tv1, (duk_double_t) DUK_LJ_TYPE_NORMAL); /* XXX: set int */
- DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
+#if defined(DUK_USE_FASTINT)
+ DUK_TVAL_SET_FASTINT_U32_UPDREF(thr, tv1, (duk_uint32_t) DUK_LJ_TYPE_NORMAL); /* side effects */
+#else
+ DUK_TVAL_SET_NUMBER_UPDREF(thr, tv1, (duk_double_t) DUK_LJ_TYPE_NORMAL); /* side effects */
+#endif
tv1 = NULL;
DUK_CAT_CLEAR_FINALLY_ENABLED(cat);
@@ -68107,7 +69783,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
/* no need to unwind callstack */
}
- act->pc = cat->pc_base + 1;
+ curr_pc = cat->pc_base + 1;
break;
}
@@ -68115,7 +69791,11 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
duk_context *ctx = (duk_context *) thr;
duk_catcher *cat;
duk_tval *tv1;
- duk_small_uint_fast_t cont_type;
+ duk_small_uint_t cont_type;
+ duk_small_uint_t ret_result;
+
+ /* Sync and NULL early. */
+ DUK__SYNC_AND_NULL_CURR_PC();
DUK_ASSERT(thr->catchstack_top >= 1);
DUK_ASSERT(thr->callstack_top >= 1);
@@ -68136,29 +69816,84 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
tv1 = thr->valstack + cat->idx_base + 1; /* type */
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv1));
- cont_type = (duk_small_uint_fast_t) DUK_TVAL_GET_NUMBER(tv1);
+ cont_type = (duk_small_uint_t) DUK_TVAL_GET_NUMBER(tv1);
- if (cont_type == DUK_LJ_TYPE_NORMAL) {
+ switch (cont_type) {
+ case DUK_LJ_TYPE_NORMAL: {
DUK_DDD(DUK_DDDPRINT("ENDFIN: finally part finishing with 'normal' (non-abrupt) completion -> "
"dismantle catcher, resume execution after ENDFIN"));
duk_hthread_catchstack_unwind(thr, thr->catchstack_top - 1);
/* no need to unwind callstack */
- } else {
+ goto restart_execution;
+ }
+ case DUK_LJ_TYPE_RETURN: {
+ DUK_DDD(DUK_DDDPRINT("ENDFIN: finally part finishing with 'return' complation -> dismantle "
+ "catcher, handle return, lj.value1=%!T", thr->valstack + cat->idx_base));
+
+ /* Not necessary to unwind catchstack: return handling will
+ * do it. The finally flag of 'cat' is no longer set. The
+ * catch flag may be set, but it's not checked by return handling.
+ */
+ DUK_ASSERT(!DUK_CAT_HAS_FINALLY_ENABLED(cat)); /* cleared before entering finally */
+#if 0
+ duk_hthread_catchstack_unwind(thr, thr->catchstack_top - 1);
+#endif
+
+ duk_push_tval(ctx, thr->valstack + cat->idx_base);
+ ret_result = duk__handle_return(thr,
+ entry_thread,
+ entry_callstack_top);
+ if (ret_result == DUK__RETHAND_RESTART) {
+ goto restart_execution;
+ }
+ DUK_ASSERT(ret_result == DUK__RETHAND_FINISHED);
+
+ DUK_DDD(DUK_DDDPRINT("exiting executor after ENDFIN and RETURN (pseudo) longjmp type"));
+ return;
+ }
+ case DUK_LJ_TYPE_BREAK:
+ case DUK_LJ_TYPE_CONTINUE: {
+ duk_uint_t label_id;
+ duk_small_uint_t lj_type;
+
+ /* Not necessary to unwind catchstack: break/continue
+ * handling will do it. The finally flag of 'cat' is
+ * no longer set. The catch flag may be set, but it's
+ * not checked by break/continue handling.
+ */
+#if 0
+ duk_hthread_catchstack_unwind(thr, thr->catchstack_top - 1);
+#endif
+
+ tv1 = thr->valstack + cat->idx_base;
+ DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv1));
+#if defined(DUK_USE_FASTINT)
+ DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv1));
+ label_id = (duk_small_uint_t) DUK_TVAL_GET_FASTINT_U32(tv1);
+#else
+ label_id = (duk_small_uint_t) DUK_TVAL_GET_NUMBER(tv1);
+#endif
+ lj_type = cont_type;
+ duk__handle_break_or_continue(thr, label_id, lj_type);
+ goto restart_execution;
+ }
+ default: {
DUK_DDD(DUK_DDDPRINT("ENDFIN: finally part finishing with abrupt completion, lj_type=%ld -> "
"dismantle catcher, re-throw error",
(long) cont_type));
duk_push_tval(ctx, thr->valstack + cat->idx_base);
- /* XXX: assert lj type valid */
duk_err_setup_heap_ljstate(thr, (duk_small_int_t) cont_type);
DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* always in executor */
duk_err_longjmp(thr);
DUK_UNREACHABLE();
}
+ }
- /* continue execution after ENDFIN */
+ /* Must restart in all cases because we NULLed thr->ptr_curr_pc. */
+ DUK_UNREACHABLE();
break;
}
@@ -68171,6 +69906,12 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
* break re-throwing for instance.
*/
+ /* Sync so that augmentation sees up-to-date activations, NULL
+ * thr->ptr_curr_pc so that it's not used if side effects occur
+ * in augmentation or longjmp handling.
+ */
+ DUK__SYNC_AND_NULL_CURR_PC();
+
duk_dup(ctx, (duk_idx_t) bc);
DUK_DDD(DUK_DDDPRINT("THROW ERROR (BYTECODE): %!dT (before throw augment)",
(duk_tval *) duk_get_tval(ctx, -1)));
@@ -68184,7 +69925,6 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* always in executor */
duk_err_longjmp(thr);
-
DUK_UNREACHABLE();
break;
}
@@ -68210,10 +69950,14 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
* from precompiled bytecode.
*/
#if defined(DUK_USE_DEBUGGER_SUPPORT)
- DUK_D(DUK_DPRINT("DEBUGGER statement encountered, halt execution"));
if (DUK_HEAP_IS_DEBUGGER_ATTACHED(thr->heap)) {
- DUK_HEAP_SET_PAUSED(thr->heap);
+ DUK_D(DUK_DPRINT("DEBUGGER statement encountered, halt execution"));
+ DUK__SYNC_AND_NULL_CURR_PC();
+ duk_debug_halt_execution(thr, 1 /*use_prev_pc*/);
+ DUK_D(DUK_DPRINT("DEBUGGER statement finished, resume execution"));
goto restart_execution;
+ } else {
+ DUK_D(DUK_DPRINT("DEBUGGER statement ignored, debugger not attached"));
}
#else
DUK_D(DUK_DPRINT("DEBUGGER statement ignored, no debugger support"));
@@ -68222,43 +69966,23 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
}
case DUK_EXTRAOP_BREAK: {
- duk_context *ctx = (duk_context *) thr;
duk_uint_fast_t bc = DUK_DEC_BC(ins);
- /* always the "slow break" variant (longjmp'ing); a "fast break" is
- * simply an DUK_OP_JUMP.
- */
-
DUK_DDD(DUK_DDDPRINT("BREAK: %ld", (long) bc));
- duk_push_uint(ctx, (duk_uint_t) bc);
- duk_err_setup_heap_ljstate(thr, DUK_LJ_TYPE_BREAK);
-
- DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* always in executor */
- duk_err_longjmp(thr);
-
- DUK_UNREACHABLE();
- break;
+ DUK__SYNC_AND_NULL_CURR_PC();
+ duk__handle_break_or_continue(thr, (duk_uint_t) bc, DUK_LJ_TYPE_BREAK);
+ goto restart_execution;
}
case DUK_EXTRAOP_CONTINUE: {
- duk_context *ctx = (duk_context *) thr;
duk_uint_fast_t bc = DUK_DEC_BC(ins);
- /* always the "slow continue" variant (longjmp'ing); a "fast continue" is
- * simply an DUK_OP_JUMP.
- */
-
DUK_DDD(DUK_DDDPRINT("CONTINUE: %ld", (long) bc));
- duk_push_uint(ctx, (duk_uint_t) bc);
- duk_err_setup_heap_ljstate(thr, DUK_LJ_TYPE_CONTINUE);
-
- DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* always in executor */
- duk_err_longjmp(thr);
-
- DUK_UNREACHABLE();
- break;
+ DUK__SYNC_AND_NULL_CURR_PC();
+ duk__handle_break_or_continue(thr, (duk_uint_t) bc, DUK_LJ_TYPE_CONTINUE);
+ goto restart_execution;
}
case DUK_EXTRAOP_BNOT: {
@@ -68313,7 +70037,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
cat->flags = DUK_CAT_TYPE_LABEL | (bc << DUK_CAT_LABEL_SHIFT);
cat->callstack_index = thr->callstack_top - 1;
- cat->pc_base = act->pc; /* pre-incremented, points to first jump slot */
+ cat->pc_base = (duk_instr_t *) curr_pc; /* pre-incremented, points to first jump slot */
cat->idx_base = 0; /* unused for label */
cat->h_varname = NULL;
@@ -68322,7 +70046,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
(long) cat->flags, (long) cat->callstack_index, (long) cat->pc_base,
(long) cat->idx_base, (duk_heaphdr *) cat->h_varname, (long) DUK_CAT_GET_LABEL(cat)));
- act->pc += 2; /* skip jump slots */
+ curr_pc += 2; /* skip jump slots */
break;
}
@@ -68347,32 +70071,6 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
break;
}
-#ifdef DUK_USE_DEBUG
- case DUK_EXTRAOP_DUMPREG: {
- DUK_D(DUK_DPRINT("DUMPREG: %ld -> %!T",
- (long) DUK_DEC_BC(ins),
- (duk_tval *) duk_get_tval((duk_context *) thr, (duk_idx_t) DUK_DEC_BC(ins))));
- break;
- }
-
- case DUK_EXTRAOP_DUMPREGS: {
- duk_idx_t i, i_top;
- i_top = duk_get_top((duk_context *) thr);
- DUK_D(DUK_DPRINT("DUMPREGS: %ld regs", (long) i_top));
- for (i = 0; i < i_top; i++) {
- DUK_D(DUK_DPRINT(" r%ld -> %!dT",
- (long) i,
- (duk_tval *) duk_get_tval((duk_context *) thr, i)));
- }
- break;
- }
-
- case DUK_EXTRAOP_LOGMARK: {
- DUK_D(DUK_DPRINT("LOGMARK: mark %ld at pc %ld", (long) DUK_DEC_BC(ins), (long) (act->pc - 1))); /* -1, autoinc */
- break;
- }
-#endif /* DUK_USE_DEBUG */
-
default: {
DUK__INTERNAL_ERROR("invalid extra opcode");
}
@@ -68400,7 +70098,16 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
#endif
}
+#undef DUK__LONGJMP_RESTART
+#undef DUK__LONGJMP_FINISHED
+#undef DUK__LONGJMP_RETHROW
+
+#undef DUK__RETHAND_RESTART
+#undef DUK__RETHAND_FINISHED
+
#undef DUK__INTERNAL_ERROR
+#undef DUK__SYNC_CURR_PC
+#undef DUK__SYNC_AND_NULL_CURR_PC
#line 1 "duk_js_ops.c"
/*
* Ecmascript specification algorithm and conversion helpers.
@@ -68506,6 +70213,7 @@ DUK_INTERNAL duk_bool_t duk_js_toboolean(duk_tval *tv) {
/* number */
duk_double_t d;
int c;
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_DOUBLE(tv));
d = DUK_TVAL_GET_DOUBLE(tv);
c = DUK_FPCLASSIFY((double) d);
@@ -68644,6 +70352,7 @@ DUK_INTERNAL duk_double_t duk_js_tonumber(duk_hthread *thr, duk_tval *tv) {
#endif
default: {
/* number */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
DUK_ASSERT(DUK_TVAL_IS_DOUBLE(tv));
return DUK_TVAL_GET_DOUBLE(tv);
}
@@ -69041,6 +70750,8 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
case DUK_TAG_FASTINT:
#endif
default: {
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv_x));
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv_y));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_x));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_y));
DUK_UNREACHABLE();
@@ -69690,6 +71401,7 @@ DUK_INTERNAL duk_hstring *duk_js_typeof(duk_hthread *thr, duk_tval *tv_x) {
#endif
default: {
/* number */
+ DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv_x));
DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_x));
stridx = DUK_STRIDX_LC_NUMBER;
break;
@@ -69780,8 +71492,8 @@ DUK_INTERNAL duk_uarridx_t duk_js_to_arrayindex_string_helper(duk_hstring *h) {
* convenient field). The prototype chain is not followed in the ordinary
* sense for variable lookups.
*
- * See identifier-handling.txt for more details on the identifier algorithms
- * and the internal representation. See function-objects.txt for details on
+ * See identifier-handling.rst for more details on the identifier algorithms
+ * and the internal representation. See function-objects.rst for details on
* what function templates and instances are expected to look like.
*
* Care must be taken to avoid duk_tval pointer invalidation caused by
@@ -69822,7 +71534,7 @@ typedef struct {
*
* See E5 Section 13.2 for detailed requirements on the function objects;
* there are no similar requirements for function "templates" which are an
- * implementation dependent internal feature. Also see function-objects.txt
+ * implementation dependent internal feature. Also see function-objects.rst
* for a discussion on the function instance properties provided by this
* implementation.
*
@@ -69980,7 +71692,7 @@ void duk_js_push_closure(duk_hthread *thr,
* _Lexenv is always set; _Varenv defaults to _Lexenv if missing,
* so _Varenv is only set if _Lexenv != _Varenv.
*
- * This is relatively complex, see doc/identifier-handling.txt.
+ * This is relatively complex, see doc/identifier-handling.rst.
*/
if (DUK_HOBJECT_HAS_NEWENV(&fun_temp->obj)) {
@@ -70653,6 +72365,8 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
duk_bool_t parents,
duk__id_lookup_result *out) {
duk_tval *tv;
+ duk_tval *tv_target;
+ duk_tval tv_name;
duk_uint_t sanity;
DUK_ASSERT(thr != NULL);
@@ -70814,7 +72528,8 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
*
* Binding (target) object is an external, uncontrolled object.
* Identifier may be bound in an ancestor property, and may be
- * an accessor.
+ * an accessor. Target can also be a Proxy which we must support
+ * here.
*/
/* XXX: we could save space by using _Target OR _This. If _Target, assume
@@ -70823,24 +72538,38 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
*/
duk_hobject *target;
+ duk_bool_t found;
DUK_ASSERT(cl == DUK_HOBJECT_CLASS_OBJENV);
- tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, env, DUK_HTHREAD_STRING_INT_TARGET(thr));
- DUK_ASSERT(tv != NULL);
- DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv));
- target = DUK_TVAL_GET_OBJECT(tv);
+ tv_target = duk_hobject_find_existing_entry_tval_ptr(thr->heap, env, DUK_HTHREAD_STRING_INT_TARGET(thr));
+ DUK_ASSERT(tv_target != NULL);
+ DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv_target));
+ target = DUK_TVAL_GET_OBJECT(tv_target);
DUK_ASSERT(target != NULL);
- /* Note: we must traverse the prototype chain, so use an actual
- * hasprop call here. The property may also be an accessor, so
- * we can't get an duk_tval pointer here.
+ /* Target may be a Proxy or property may be an accessor, so we must
+ * use an actual, Proxy-aware hasprop check here.
*
* out->holder is NOT set to the actual duk_hobject where the
- * property is found, but rather the target object.
+ * property is found, but rather the object binding target object.
*/
- if (duk_hobject_hasprop_raw(thr, target, name)) {
+ if (DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(target)) {
+ DUK_ASSERT(name != NULL);
+ DUK_TVAL_SET_STRING(&tv_name, name);
+
+ found = duk_hobject_hasprop(thr, tv_target, &tv_name);
+ } else {
+ /* XXX: duk_hobject_hasprop() would be correct for
+ * non-Proxy objects too, but it is about ~20-25%
+ * slower at present so separate code paths for
+ * Proxy and non-Proxy now.
+ */
+ found = duk_hobject_hasprop_raw(thr, target, name);
+ }
+
+ if (found) {
out->value = NULL; /* can't get value, may be accessor */
out->attrs = 0; /* irrelevant when out->value == NULL */
tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, env, DUK_HTHREAD_STRING_INT_THIS(thr));
@@ -71098,17 +72827,13 @@ void duk__putvar_helper(duk_hthread *thr,
* (immutable binding), use duk_hobject_putprop() which
* will respect mutability.
*/
- duk_tval tv_tmp;
duk_tval *tv_val;
DUK_ASSERT(ref.this_binding == NULL); /* always for register bindings */
tv_val = ref.value;
DUK_ASSERT(tv_val != NULL);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv_val);
- DUK_TVAL_SET_TVAL(tv_val, val);
- DUK_TVAL_INCREF(thr, val);
- DUK_TVAL_DECREF(thr, &tv_tmp); /* must be last */
+ DUK_TVAL_SET_TVAL_UPDREF(thr, tv_val, val); /* side effects */
/* ref.value and ref.this_binding invalidated here */
} else {
@@ -71451,12 +73176,8 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
DUK_UNREF(tmp);
} else {
- duk_tval tv_tmp;
-
tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, holder, e_idx);
- DUK_TVAL_SET_TVAL(&tv_tmp, tv);
- DUK_TVAL_SET_UNDEFINED_UNUSED(tv);
- DUK_TVAL_DECREF(thr, &tv_tmp);
+ DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv);
}
/* Here val would be potentially invalid if we didn't make
@@ -73644,7 +75365,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
* and uses a minimum number of digits. The big number arithmetic has a
* fixed maximum size and does not require dynamic allocations.
*
- * See: doc/number-conversion.txt.
+ * See: doc/number-conversion.rst.
*/
/* include removed: duk_internal.h */
@@ -74259,7 +75980,7 @@ DUK_LOCAL void duk__bi_exp_small(duk__bigint *x, duk_small_int_t b, duk_small_in
* The same algorithm is used for number parsing (with b=10 and B=2)
* by generating one extra digit and doing rounding manually.
*
- * See doc/number-conversion.txt for limitations.
+ * See doc/number-conversion.rst for limitations.
*/
/* Maximum number of digits generated. */
@@ -75905,7 +77626,7 @@ DUK_INTERNAL void duk_numconv_parse(duk_context *ctx, duk_small_int_t radix, duk
/*
* Regexp compilation.
*
- * See doc/regexp.txt for a discussion of the compilation approach and
+ * See doc/regexp.rst for a discussion of the compilation approach and
* current limitations.
*
* Regexp bytecode assumes jumps can be expressed with signed 32-bit
@@ -76046,7 +77767,7 @@ DUK_LOCAL void duk__remove_slice(duk_re_compiler_ctx *re_ctx, duk_uint32_t data_
*
* Computing the final (adjusted) skip value, which is relative to the
* first byte of the next instruction, is a bit tricky because of the
- * variable length UTF-8 encoding. See doc/regexp.txt for discussion.
+ * variable length UTF-8 encoding. See doc/regexp.rst for discussion.
*/
DUK_LOCAL duk_uint32_t duk__insert_jump_offset(duk_re_compiler_ctx *re_ctx, duk_uint32_t offset, duk_int32_t skip) {
duk_small_int_t len;
@@ -76079,7 +77800,7 @@ DUK_LOCAL duk_uint32_t duk__append_jump_offset(duk_re_compiler_ctx *re_ctx, duk_
* continuous range is not necessarily continuous (e.g. [x-{] is
* continuous but [X-{] is not). The current algorithm creates the
* canonicalized range(s) space efficiently at the cost of compile
- * time execution time (see doc/regexp.txt for discussion).
+ * time execution time (see doc/regexp.rst for discussion).
*
* Note that the ctx->nranges is a context-wide temporary value
* (this is OK because there cannot be multiple character classes
@@ -76145,7 +77866,7 @@ DUK_LOCAL void duk__generate_ranges(void *userdata, duk_codepoint_t r1, duk_code
* lookaheads, capturing parentheses, and non-capturing parentheses.
*
* The function determines whether the entire disjunction is a 'simple atom'
- * (see doc/regexp.txt discussion on 'simple quantifiers') and if so,
+ * (see doc/regexp.rst discussion on 'simple quantifiers') and if so,
* returns the atom character length which is needed by the caller to keep
* track of its own atom character length. A disjunction with more than one
* alternative is never considered a simple atom (although in some cases
@@ -76846,7 +78567,7 @@ DUK_INTERNAL void duk_regexp_compile(duk_hthread *thr) {
re_ctx.lex.input = DUK_HSTRING_GET_DATA(h_pattern);
re_ctx.lex.input_length = DUK_HSTRING_GET_BYTELEN(h_pattern);
re_ctx.lex.token_limit = DUK_RE_COMPILE_TOKEN_LIMIT;
- re_ctx.recursion_limit = DUK_RE_COMPILE_RECURSION_LIMIT;
+ re_ctx.recursion_limit = DUK_USE_REGEXP_COMPILER_RECLIMIT;
re_ctx.re_flags = duk__parse_regexp_flags(thr, h_flags);
DUK_BW_INIT_PUSHBUF(thr, &re_ctx.bw, DUK__RE_INITIAL_BUFSIZE);
@@ -77163,7 +78884,7 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
*
* There is no opcode for matching multiple characters. The
* regexp compiler has trouble joining strings efficiently
- * during compilation. See doc/regexp.txt for more discussion.
+ * during compilation. See doc/regexp.rst for more discussion.
*/
duk_codepoint_t c1, c2;
@@ -77702,7 +79423,7 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
re_ctx.bytecode = (duk_uint8_t *) DUK_HSTRING_GET_DATA(h_bytecode);
re_ctx.bytecode_end = re_ctx.bytecode + DUK_HSTRING_GET_BYTELEN(h_bytecode);
re_ctx.saved = NULL;
- re_ctx.recursion_limit = DUK_RE_EXECUTE_RECURSION_LIMIT;
+ re_ctx.recursion_limit = DUK_USE_REGEXP_EXECUTOR_RECLIMIT;
re_ctx.steps_limit = DUK_RE_EXECUTE_STEPS_LIMIT;
/* read header */
@@ -78367,7 +80088,7 @@ DUK_LOCAL void duk__selftest_64bit_arithmetic(void) {
* Casting
*/
-DUK_LOCAL void duk__selftest_cast_double_to_uint(void) {
+DUK_LOCAL void duk__selftest_cast_double_to_small_uint(void) {
/*
* https://github.com/svaarala/duktape/issues/127#issuecomment-77863473
*/
@@ -78378,12 +80099,14 @@ DUK_LOCAL void duk__selftest_cast_double_to_uint(void) {
duk_double_t d1v, d2v;
duk_small_uint_t uv;
+ /* Test without volatiles */
+
d1 = 1.0;
u = (duk_small_uint_t) d1;
d2 = (duk_double_t) u;
if (!(d1 == 1.0 && u == 1 && d2 == 1.0 && d1 == d2)) {
- DUK_PANIC(DUK_ERR_INTERNAL_ERROR, "self test failed: double to uint cast failed");
+ DUK_PANIC(DUK_ERR_INTERNAL_ERROR, "self test failed: double to duk_small_uint_t cast failed");
}
/* Same test with volatiles */
@@ -78393,7 +80116,26 @@ DUK_LOCAL void duk__selftest_cast_double_to_uint(void) {
d2v = (duk_double_t) uv;
if (!(d1v == 1.0 && uv == 1 && d2v == 1.0 && d1v == d2v)) {
- DUK_PANIC(DUK_ERR_INTERNAL_ERROR, "self test failed: double to uint cast failed");
+ DUK_PANIC(DUK_ERR_INTERNAL_ERROR, "self test failed: double to duk_small_uint_t cast failed");
+ }
+}
+
+DUK_LOCAL void duk__selftest_cast_double_to_uint32(void) {
+ /*
+ * This test fails on an exotic ARM target; double-to-uint
+ * cast is incorrectly clamped to -signed- int highest value.
+ *
+ * https://github.com/svaarala/duktape/issues/336
+ */
+
+ duk_double_t dv;
+ duk_uint32_t uv;
+
+ dv = 3735928559.0; /* 0xdeadbeef in decimal */
+ uv = (duk_uint32_t) dv;
+
+ if (uv != 0xdeadbeefUL) {
+ DUK_PANIC(DUK_ERR_INTERNAL_ERROR, "self test failed: double to duk_uint32_t cast failed");
}
}
@@ -78412,7 +80154,8 @@ DUK_INTERNAL void duk_selftest_run_tests(void) {
duk__selftest_double_zero_sign();
duk__selftest_struct_align();
duk__selftest_64bit_arithmetic();
- duk__selftest_cast_double_to_uint();
+ duk__selftest_cast_double_to_small_uint();
+ duk__selftest_cast_double_to_uint32();
}
#undef DUK__DBLUNION_CMP_TRUE
@@ -78841,6 +80584,5296 @@ const duk_uint8_t duk_unicode_caseconv_lc[616] = {
125,44,109,2,81,44,110,2,113,44,111,2,80,44,112,2,82,167,125,29,121,167,
141,2,101,2,2,97,0,52,129,131,128,
};
+
+/* FIXME: CONDITIONAL */
+/*
+ * Automatically generated by extract_caseconv.py, do not edit!
+ */
+
+const duk_uint16_t duk_unicode_re_canon_lookup[65536] = {
+0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,
+28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,
+53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,
+78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,
+71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,
+126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,
+162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,
+180,924,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,
+198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,
+216,217,218,219,220,221,222,223,192,193,194,195,196,197,198,199,200,201,
+202,203,204,205,206,207,208,209,210,211,212,213,214,247,216,217,218,219,
+220,221,222,376,256,256,258,258,260,260,262,262,264,264,266,266,268,268,
+270,270,272,272,274,274,276,276,278,278,280,280,282,282,284,284,286,286,
+288,288,290,290,292,292,294,294,296,296,298,298,300,300,302,302,304,305,
+306,306,308,308,310,310,312,313,313,315,315,317,317,319,319,321,321,323,
+323,325,325,327,327,329,330,330,332,332,334,334,336,336,338,338,340,340,
+342,342,344,344,346,346,348,348,350,350,352,352,354,354,356,356,358,358,
+360,360,362,362,364,364,366,366,368,368,370,370,372,372,374,374,376,377,
+377,379,379,381,381,383,579,385,386,386,388,388,390,391,391,393,394,395,
+395,397,398,399,400,401,401,403,404,502,406,407,408,408,573,411,412,413,
+544,415,416,416,418,418,420,420,422,423,423,425,426,427,428,428,430,431,
+431,433,434,435,435,437,437,439,440,440,442,443,444,444,446,503,448,449,
+450,451,452,452,452,455,455,455,458,458,458,461,461,463,463,465,465,467,
+467,469,469,471,471,473,473,475,475,398,478,478,480,480,482,482,484,484,
+486,486,488,488,490,490,492,492,494,494,496,497,497,497,500,500,502,503,
+504,504,506,506,508,508,510,510,512,512,514,514,516,516,518,518,520,520,
+522,522,524,524,526,526,528,528,530,530,532,532,534,534,536,536,538,538,
+540,540,542,542,544,545,546,546,548,548,550,550,552,552,554,554,556,556,
+558,558,560,560,562,562,564,565,566,567,568,569,570,571,571,573,574,11390,
+11391,577,577,579,580,581,582,582,584,584,586,586,588,588,590,590,11375,
+11373,11376,385,390,597,393,394,600,399,602,400,604,605,606,607,403,609,
+610,404,612,42893,614,615,407,406,618,11362,620,621,622,412,624,11374,413,
+627,628,415,630,631,632,633,634,635,636,11364,638,639,422,641,642,425,644,
+645,646,647,430,580,433,434,581,653,654,655,656,657,439,659,660,661,662,
+663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,
+681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,
+699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,
+717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,
+735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,
+753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,
+771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,
+789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,
+807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,
+825,826,827,828,829,830,831,832,833,834,835,836,921,838,839,840,841,842,
+843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,
+861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,
+879,880,880,882,882,884,885,886,886,888,889,890,1021,1022,1023,894,895,896,
+897,898,899,900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,
+915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,930,931,932,
+933,934,935,936,937,938,939,902,904,905,906,944,913,914,915,916,917,918,
+919,920,921,922,923,924,925,926,927,928,929,931,931,932,933,934,935,936,
+937,938,939,908,910,911,975,914,920,978,979,980,934,928,975,984,984,986,
+986,988,988,990,990,992,992,994,994,996,996,998,998,1000,1000,1002,1002,
+1004,1004,1006,1006,922,929,1017,1011,1012,917,1014,1015,1015,1017,1018,
+1018,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,
+1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,
+1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,
+1064,1065,1066,1067,1068,1069,1070,1071,1040,1041,1042,1043,1044,1045,1046,
+1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,
+1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1024,1025,1026,1027,1028,
+1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1120,1120,1122,1122,
+1124,1124,1126,1126,1128,1128,1130,1130,1132,1132,1134,1134,1136,1136,1138,
+1138,1140,1140,1142,1142,1144,1144,1146,1146,1148,1148,1150,1150,1152,1152,
+1154,1155,1156,1157,1158,1159,1160,1161,1162,1162,1164,1164,1166,1166,1168,
+1168,1170,1170,1172,1172,1174,1174,1176,1176,1178,1178,1180,1180,1182,1182,
+1184,1184,1186,1186,1188,1188,1190,1190,1192,1192,1194,1194,1196,1196,1198,
+1198,1200,1200,1202,1202,1204,1204,1206,1206,1208,1208,1210,1210,1212,1212,
+1214,1214,1216,1217,1217,1219,1219,1221,1221,1223,1223,1225,1225,1227,1227,
+1229,1229,1216,1232,1232,1234,1234,1236,1236,1238,1238,1240,1240,1242,1242,
+1244,1244,1246,1246,1248,1248,1250,1250,1252,1252,1254,1254,1256,1256,1258,
+1258,1260,1260,1262,1262,1264,1264,1266,1266,1268,1268,1270,1270,1272,1272,
+1274,1274,1276,1276,1278,1278,1280,1280,1282,1282,1284,1284,1286,1286,1288,
+1288,1290,1290,1292,1292,1294,1294,1296,1296,1298,1298,1300,1300,1302,1302,
+1304,1304,1306,1306,1308,1308,1310,1310,1312,1312,1314,1314,1316,1316,1318,
+1318,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,
+1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,
+1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,
+1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1329,1330,
+1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,
+1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,
+1361,1362,1363,1364,1365,1366,1415,1416,1417,1418,1419,1420,1421,1422,1423,
+1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,
+1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,
+1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,
+1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483,
+1484,1485,1486,1487,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,
+1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,
+1514,1515,1516,1517,1518,1519,1520,1521,1522,1523,1524,1525,1526,1527,1528,
+1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1539,1540,1541,1542,1543,
+1544,1545,1546,1547,1548,1549,1550,1551,1552,1553,1554,1555,1556,1557,1558,
+1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1569,1570,1571,1572,1573,
+1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,
+1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599,1600,1601,1602,1603,
+1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,
+1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632,1633,
+1634,1635,1636,1637,1638,1639,1640,1641,1642,1643,1644,1645,1646,1647,1648,
+1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,
+1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,
+1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,1690,1691,1692,1693,
+1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,1704,1705,1706,1707,1708,
+1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,
+1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,1735,1736,1737,1738,
+1739,1740,1741,1742,1743,1744,1745,1746,1747,1748,1749,1750,1751,1752,1753,
+1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,
+1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,1779,1780,1781,1782,1783,
+1784,1785,1786,1787,1788,1789,1790,1791,1792,1793,1794,1795,1796,1797,1798,
+1799,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,
+1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,
+1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,
+1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,
+1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,
+1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886,1887,1888,
+1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1902,1903,
+1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,1915,1916,1917,1918,
+1919,1920,1921,1922,1923,1924,1925,1926,1927,1928,1929,1930,1931,1932,1933,
+1934,1935,1936,1937,1938,1939,1940,1941,1942,1943,1944,1945,1946,1947,1948,
+1949,1950,1951,1952,1953,1954,1955,1956,1957,1958,1959,1960,1961,1962,1963,
+1964,1965,1966,1967,1968,1969,1970,1971,1972,1973,1974,1975,1976,1977,1978,
+1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,
+1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,
+2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,
+2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,
+2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,
+2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,2065,2066,2067,2068,
+2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,2079,2080,2081,2082,2083,
+2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,
+2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,
+2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,2124,2125,2126,2127,2128,
+2129,2130,2131,2132,2133,2134,2135,2136,2137,2138,2139,2140,2141,2142,2143,
+2144,2145,2146,2147,2148,2149,2150,2151,2152,2153,2154,2155,2156,2157,2158,
+2159,2160,2161,2162,2163,2164,2165,2166,2167,2168,2169,2170,2171,2172,2173,
+2174,2175,2176,2177,2178,2179,2180,2181,2182,2183,2184,2185,2186,2187,2188,
+2189,2190,2191,2192,2193,2194,2195,2196,2197,2198,2199,2200,2201,2202,2203,
+2204,2205,2206,2207,2208,2209,2210,2211,2212,2213,2214,2215,2216,2217,2218,
+2219,2220,2221,2222,2223,2224,2225,2226,2227,2228,2229,2230,2231,2232,2233,
+2234,2235,2236,2237,2238,2239,2240,2241,2242,2243,2244,2245,2246,2247,2248,
+2249,2250,2251,2252,2253,2254,2255,2256,2257,2258,2259,2260,2261,2262,2263,
+2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2274,2275,2276,2277,2278,
+2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,2289,2290,2291,2292,2293,
+2294,2295,2296,2297,2298,2299,2300,2301,2302,2303,2304,2305,2306,2307,2308,
+2309,2310,2311,2312,2313,2314,2315,2316,2317,2318,2319,2320,2321,2322,2323,
+2324,2325,2326,2327,2328,2329,2330,2331,2332,2333,2334,2335,2336,2337,2338,
+2339,2340,2341,2342,2343,2344,2345,2346,2347,2348,2349,2350,2351,2352,2353,
+2354,2355,2356,2357,2358,2359,2360,2361,2362,2363,2364,2365,2366,2367,2368,
+2369,2370,2371,2372,2373,2374,2375,2376,2377,2378,2379,2380,2381,2382,2383,
+2384,2385,2386,2387,2388,2389,2390,2391,2392,2393,2394,2395,2396,2397,2398,
+2399,2400,2401,2402,2403,2404,2405,2406,2407,2408,2409,2410,2411,2412,2413,
+2414,2415,2416,2417,2418,2419,2420,2421,2422,2423,2424,2425,2426,2427,2428,
+2429,2430,2431,2432,2433,2434,2435,2436,2437,2438,2439,2440,2441,2442,2443,
+2444,2445,2446,2447,2448,2449,2450,2451,2452,2453,2454,2455,2456,2457,2458,
+2459,2460,2461,2462,2463,2464,2465,2466,2467,2468,2469,2470,2471,2472,2473,
+2474,2475,2476,2477,2478,2479,2480,2481,2482,2483,2484,2485,2486,2487,2488,
+2489,2490,2491,2492,2493,2494,2495,2496,2497,2498,2499,2500,2501,2502,2503,
+2504,2505,2506,2507,2508,2509,2510,2511,2512,2513,2514,2515,2516,2517,2518,
+2519,2520,2521,2522,2523,2524,2525,2526,2527,2528,2529,2530,2531,2532,2533,
+2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2544,2545,2546,2547,2548,
+2549,2550,2551,2552,2553,2554,2555,2556,2557,2558,2559,2560,2561,2562,2563,
+2564,2565,2566,2567,2568,2569,2570,2571,2572,2573,2574,2575,2576,2577,2578,
+2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,
+2594,2595,2596,2597,2598,2599,2600,2601,2602,2603,2604,2605,2606,2607,2608,
+2609,2610,2611,2612,2613,2614,2615,2616,2617,2618,2619,2620,2621,2622,2623,
+2624,2625,2626,2627,2628,2629,2630,2631,2632,2633,2634,2635,2636,2637,2638,
+2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,
+2654,2655,2656,2657,2658,2659,2660,2661,2662,2663,2664,2665,2666,2667,2668,
+2669,2670,2671,2672,2673,2674,2675,2676,2677,2678,2679,2680,2681,2682,2683,
+2684,2685,2686,2687,2688,2689,2690,2691,2692,2693,2694,2695,2696,2697,2698,
+2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,2709,2710,2711,2712,2713,
+2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2727,2728,
+2729,2730,2731,2732,2733,2734,2735,2736,2737,2738,2739,2740,2741,2742,2743,
+2744,2745,2746,2747,2748,2749,2750,2751,2752,2753,2754,2755,2756,2757,2758,
+2759,2760,2761,2762,2763,2764,2765,2766,2767,2768,2769,2770,2771,2772,2773,
+2774,2775,2776,2777,2778,2779,2780,2781,2782,2783,2784,2785,2786,2787,2788,
+2789,2790,2791,2792,2793,2794,2795,2796,2797,2798,2799,2800,2801,2802,2803,
+2804,2805,2806,2807,2808,2809,2810,2811,2812,2813,2814,2815,2816,2817,2818,
+2819,2820,2821,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,
+2834,2835,2836,2837,2838,2839,2840,2841,2842,2843,2844,2845,2846,2847,2848,
+2849,2850,2851,2852,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,
+2864,2865,2866,2867,2868,2869,2870,2871,2872,2873,2874,2875,2876,2877,2878,
+2879,2880,2881,2882,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,
+2894,2895,2896,2897,2898,2899,2900,2901,2902,2903,2904,2905,2906,2907,2908,
+2909,2910,2911,2912,2913,2914,2915,2916,2917,2918,2919,2920,2921,2922,2923,
+2924,2925,2926,2927,2928,2929,2930,2931,2932,2933,2934,2935,2936,2937,2938,
+2939,2940,2941,2942,2943,2944,2945,2946,2947,2948,2949,2950,2951,2952,2953,
+2954,2955,2956,2957,2958,2959,2960,2961,2962,2963,2964,2965,2966,2967,2968,
+2969,2970,2971,2972,2973,2974,2975,2976,2977,2978,2979,2980,2981,2982,2983,
+2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2995,2996,2997,2998,
+2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,3009,3010,3011,3012,3013,
+3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028,
+3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,3039,3040,3041,3042,3043,
+3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,
+3059,3060,3061,3062,3063,3064,3065,3066,3067,3068,3069,3070,3071,3072,3073,
+3074,3075,3076,3077,3078,3079,3080,3081,3082,3083,3084,3085,3086,3087,3088,
+3089,3090,3091,3092,3093,3094,3095,3096,3097,3098,3099,3100,3101,3102,3103,
+3104,3105,3106,3107,3108,3109,3110,3111,3112,3113,3114,3115,3116,3117,3118,
+3119,3120,3121,3122,3123,3124,3125,3126,3127,3128,3129,3130,3131,3132,3133,
+3134,3135,3136,3137,3138,3139,3140,3141,3142,3143,3144,3145,3146,3147,3148,
+3149,3150,3151,3152,3153,3154,3155,3156,3157,3158,3159,3160,3161,3162,3163,
+3164,3165,3166,3167,3168,3169,3170,3171,3172,3173,3174,3175,3176,3177,3178,
+3179,3180,3181,3182,3183,3184,3185,3186,3187,3188,3189,3190,3191,3192,3193,
+3194,3195,3196,3197,3198,3199,3200,3201,3202,3203,3204,3205,3206,3207,3208,
+3209,3210,3211,3212,3213,3214,3215,3216,3217,3218,3219,3220,3221,3222,3223,
+3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,3234,3235,3236,3237,3238,
+3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,3249,3250,3251,3252,3253,
+3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,3265,3266,3267,3268,
+3269,3270,3271,3272,3273,3274,3275,3276,3277,3278,3279,3280,3281,3282,3283,
+3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,3294,3295,3296,3297,3298,
+3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,3309,3310,3311,3312,3313,
+3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,3324,3325,3326,3327,3328,
+3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,3339,3340,3341,3342,3343,
+3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,3354,3355,3356,3357,3358,
+3359,3360,3361,3362,3363,3364,3365,3366,3367,3368,3369,3370,3371,3372,3373,
+3374,3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,3385,3386,3387,3388,
+3389,3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,
+3404,3405,3406,3407,3408,3409,3410,3411,3412,3413,3414,3415,3416,3417,3418,
+3419,3420,3421,3422,3423,3424,3425,3426,3427,3428,3429,3430,3431,3432,3433,
+3434,3435,3436,3437,3438,3439,3440,3441,3442,3443,3444,3445,3446,3447,3448,
+3449,3450,3451,3452,3453,3454,3455,3456,3457,3458,3459,3460,3461,3462,3463,
+3464,3465,3466,3467,3468,3469,3470,3471,3472,3473,3474,3475,3476,3477,3478,
+3479,3480,3481,3482,3483,3484,3485,3486,3487,3488,3489,3490,3491,3492,3493,
+3494,3495,3496,3497,3498,3499,3500,3501,3502,3503,3504,3505,3506,3507,3508,
+3509,3510,3511,3512,3513,3514,3515,3516,3517,3518,3519,3520,3521,3522,3523,
+3524,3525,3526,3527,3528,3529,3530,3531,3532,3533,3534,3535,3536,3537,3538,
+3539,3540,3541,3542,3543,3544,3545,3546,3547,3548,3549,3550,3551,3552,3553,
+3554,3555,3556,3557,3558,3559,3560,3561,3562,3563,3564,3565,3566,3567,3568,
+3569,3570,3571,3572,3573,3574,3575,3576,3577,3578,3579,3580,3581,3582,3583,
+3584,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,
+3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,3613,
+3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,
+3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3643,
+3644,3645,3646,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,3657,3658,
+3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,
+3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,3686,3687,3688,
+3689,3690,3691,3692,3693,3694,3695,3696,3697,3698,3699,3700,3701,3702,3703,
+3704,3705,3706,3707,3708,3709,3710,3711,3712,3713,3714,3715,3716,3717,3718,
+3719,3720,3721,3722,3723,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,
+3734,3735,3736,3737,3738,3739,3740,3741,3742,3743,3744,3745,3746,3747,3748,
+3749,3750,3751,3752,3753,3754,3755,3756,3757,3758,3759,3760,3761,3762,3763,
+3764,3765,3766,3767,3768,3769,3770,3771,3772,3773,3774,3775,3776,3777,3778,
+3779,3780,3781,3782,3783,3784,3785,3786,3787,3788,3789,3790,3791,3792,3793,
+3794,3795,3796,3797,3798,3799,3800,3801,3802,3803,3804,3805,3806,3807,3808,
+3809,3810,3811,3812,3813,3814,3815,3816,3817,3818,3819,3820,3821,3822,3823,
+3824,3825,3826,3827,3828,3829,3830,3831,3832,3833,3834,3835,3836,3837,3838,
+3839,3840,3841,3842,3843,3844,3845,3846,3847,3848,3849,3850,3851,3852,3853,
+3854,3855,3856,3857,3858,3859,3860,3861,3862,3863,3864,3865,3866,3867,3868,
+3869,3870,3871,3872,3873,3874,3875,3876,3877,3878,3879,3880,3881,3882,3883,
+3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,3894,3895,3896,3897,3898,
+3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,3910,3911,3912,3913,
+3914,3915,3916,3917,3918,3919,3920,3921,3922,3923,3924,3925,3926,3927,3928,
+3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,3940,3941,3942,3943,
+3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,3956,3957,3958,
+3959,3960,3961,3962,3963,3964,3965,3966,3967,3968,3969,3970,3971,3972,3973,
+3974,3975,3976,3977,3978,3979,3980,3981,3982,3983,3984,3985,3986,3987,3988,
+3989,3990,3991,3992,3993,3994,3995,3996,3997,3998,3999,4000,4001,4002,4003,
+4004,4005,4006,4007,4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,
+4019,4020,4021,4022,4023,4024,4025,4026,4027,4028,4029,4030,4031,4032,4033,
+4034,4035,4036,4037,4038,4039,4040,4041,4042,4043,4044,4045,4046,4047,4048,
+4049,4050,4051,4052,4053,4054,4055,4056,4057,4058,4059,4060,4061,4062,4063,
+4064,4065,4066,4067,4068,4069,4070,4071,4072,4073,4074,4075,4076,4077,4078,
+4079,4080,4081,4082,4083,4084,4085,4086,4087,4088,4089,4090,4091,4092,4093,
+4094,4095,4096,4097,4098,4099,4100,4101,4102,4103,4104,4105,4106,4107,4108,
+4109,4110,4111,4112,4113,4114,4115,4116,4117,4118,4119,4120,4121,4122,4123,
+4124,4125,4126,4127,4128,4129,4130,4131,4132,4133,4134,4135,4136,4137,4138,
+4139,4140,4141,4142,4143,4144,4145,4146,4147,4148,4149,4150,4151,4152,4153,
+4154,4155,4156,4157,4158,4159,4160,4161,4162,4163,4164,4165,4166,4167,4168,
+4169,4170,4171,4172,4173,4174,4175,4176,4177,4178,4179,4180,4181,4182,4183,
+4184,4185,4186,4187,4188,4189,4190,4191,4192,4193,4194,4195,4196,4197,4198,
+4199,4200,4201,4202,4203,4204,4205,4206,4207,4208,4209,4210,4211,4212,4213,
+4214,4215,4216,4217,4218,4219,4220,4221,4222,4223,4224,4225,4226,4227,4228,
+4229,4230,4231,4232,4233,4234,4235,4236,4237,4238,4239,4240,4241,4242,4243,
+4244,4245,4246,4247,4248,4249,4250,4251,4252,4253,4254,4255,4256,4257,4258,
+4259,4260,4261,4262,4263,4264,4265,4266,4267,4268,4269,4270,4271,4272,4273,
+4274,4275,4276,4277,4278,4279,4280,4281,4282,4283,4284,4285,4286,4287,4288,
+4289,4290,4291,4292,4293,4294,4295,4296,4297,4298,4299,4300,4301,4302,4303,
+4304,4305,4306,4307,4308,4309,4310,4311,4312,4313,4314,4315,4316,4317,4318,
+4319,4320,4321,4322,4323,4324,4325,4326,4327,4328,4329,4330,4331,4332,4333,
+4334,4335,4336,4337,4338,4339,4340,4341,4342,4343,4344,4345,4346,4347,4348,
+4349,4350,4351,4352,4353,4354,4355,4356,4357,4358,4359,4360,4361,4362,4363,
+4364,4365,4366,4367,4368,4369,4370,4371,4372,4373,4374,4375,4376,4377,4378,
+4379,4380,4381,4382,4383,4384,4385,4386,4387,4388,4389,4390,4391,4392,4393,
+4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,4404,4405,4406,4407,4408,
+4409,4410,4411,4412,4413,4414,4415,4416,4417,4418,4419,4420,4421,4422,4423,
+4424,4425,4426,4427,4428,4429,4430,4431,4432,4433,4434,4435,4436,4437,4438,
+4439,4440,4441,4442,4443,4444,4445,4446,4447,4448,4449,4450,4451,4452,4453,
+4454,4455,4456,4457,4458,4459,4460,4461,4462,4463,4464,4465,4466,4467,4468,
+4469,4470,4471,4472,4473,4474,4475,4476,4477,4478,4479,4480,4481,4482,4483,
+4484,4485,4486,4487,4488,4489,4490,4491,4492,4493,4494,4495,4496,4497,4498,
+4499,4500,4501,4502,4503,4504,4505,4506,4507,4508,4509,4510,4511,4512,4513,
+4514,4515,4516,4517,4518,4519,4520,4521,4522,4523,4524,4525,4526,4527,4528,
+4529,4530,4531,4532,4533,4534,4535,4536,4537,4538,4539,4540,4541,4542,4543,
+4544,4545,4546,4547,4548,4549,4550,4551,4552,4553,4554,4555,4556,4557,4558,
+4559,4560,4561,4562,4563,4564,4565,4566,4567,4568,4569,4570,4571,4572,4573,
+4574,4575,4576,4577,4578,4579,4580,4581,4582,4583,4584,4585,4586,4587,4588,
+4589,4590,4591,4592,4593,4594,4595,4596,4597,4598,4599,4600,4601,4602,4603,
+4604,4605,4606,4607,4608,4609,4610,4611,4612,4613,4614,4615,4616,4617,4618,
+4619,4620,4621,4622,4623,4624,4625,4626,4627,4628,4629,4630,4631,4632,4633,
+4634,4635,4636,4637,4638,4639,4640,4641,4642,4643,4644,4645,4646,4647,4648,
+4649,4650,4651,4652,4653,4654,4655,4656,4657,4658,4659,4660,4661,4662,4663,
+4664,4665,4666,4667,4668,4669,4670,4671,4672,4673,4674,4675,4676,4677,4678,
+4679,4680,4681,4682,4683,4684,4685,4686,4687,4688,4689,4690,4691,4692,4693,
+4694,4695,4696,4697,4698,4699,4700,4701,4702,4703,4704,4705,4706,4707,4708,
+4709,4710,4711,4712,4713,4714,4715,4716,4717,4718,4719,4720,4721,4722,4723,
+4724,4725,4726,4727,4728,4729,4730,4731,4732,4733,4734,4735,4736,4737,4738,
+4739,4740,4741,4742,4743,4744,4745,4746,4747,4748,4749,4750,4751,4752,4753,
+4754,4755,4756,4757,4758,4759,4760,4761,4762,4763,4764,4765,4766,4767,4768,
+4769,4770,4771,4772,4773,4774,4775,4776,4777,4778,4779,4780,4781,4782,4783,
+4784,4785,4786,4787,4788,4789,4790,4791,4792,4793,4794,4795,4796,4797,4798,
+4799,4800,4801,4802,4803,4804,4805,4806,4807,4808,4809,4810,4811,4812,4813,
+4814,4815,4816,4817,4818,4819,4820,4821,4822,4823,4824,4825,4826,4827,4828,
+4829,4830,4831,4832,4833,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,
+4844,4845,4846,4847,4848,4849,4850,4851,4852,4853,4854,4855,4856,4857,4858,
+4859,4860,4861,4862,4863,4864,4865,4866,4867,4868,4869,4870,4871,4872,4873,
+4874,4875,4876,4877,4878,4879,4880,4881,4882,4883,4884,4885,4886,4887,4888,
+4889,4890,4891,4892,4893,4894,4895,4896,4897,4898,4899,4900,4901,4902,4903,
+4904,4905,4906,4907,4908,4909,4910,4911,4912,4913,4914,4915,4916,4917,4918,
+4919,4920,4921,4922,4923,4924,4925,4926,4927,4928,4929,4930,4931,4932,4933,
+4934,4935,4936,4937,4938,4939,4940,4941,4942,4943,4944,4945,4946,4947,4948,
+4949,4950,4951,4952,4953,4954,4955,4956,4957,4958,4959,4960,4961,4962,4963,
+4964,4965,4966,4967,4968,4969,4970,4971,4972,4973,4974,4975,4976,4977,4978,
+4979,4980,4981,4982,4983,4984,4985,4986,4987,4988,4989,4990,4991,4992,4993,
+4994,4995,4996,4997,4998,4999,5000,5001,5002,5003,5004,5005,5006,5007,5008,
+5009,5010,5011,5012,5013,5014,5015,5016,5017,5018,5019,5020,5021,5022,5023,
+5024,5025,5026,5027,5028,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,
+5039,5040,5041,5042,5043,5044,5045,5046,5047,5048,5049,5050,5051,5052,5053,
+5054,5055,5056,5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,
+5069,5070,5071,5072,5073,5074,5075,5076,5077,5078,5079,5080,5081,5082,5083,
+5084,5085,5086,5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,
+5099,5100,5101,5102,5103,5104,5105,5106,5107,5108,5109,5110,5111,5112,5113,
+5114,5115,5116,5117,5118,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,
+5129,5130,5131,5132,5133,5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,
+5144,5145,5146,5147,5148,5149,5150,5151,5152,5153,5154,5155,5156,5157,5158,
+5159,5160,5161,5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,
+5174,5175,5176,5177,5178,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,
+5189,5190,5191,5192,5193,5194,5195,5196,5197,5198,5199,5200,5201,5202,5203,
+5204,5205,5206,5207,5208,5209,5210,5211,5212,5213,5214,5215,5216,5217,5218,
+5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,
+5234,5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,5245,5246,5247,5248,
+5249,5250,5251,5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,
+5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,
+5279,5280,5281,5282,5283,5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,
+5294,5295,5296,5297,5298,5299,5300,5301,5302,5303,5304,5305,5306,5307,5308,
+5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,5322,5323,
+5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,5334,5335,5336,5337,5338,
+5339,5340,5341,5342,5343,5344,5345,5346,5347,5348,5349,5350,5351,5352,5353,
+5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,5365,5366,5367,5368,
+5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,5380,5381,5382,5383,
+5384,5385,5386,5387,5388,5389,5390,5391,5392,5393,5394,5395,5396,5397,5398,
+5399,5400,5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,5411,5412,5413,
+5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,
+5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440,5441,5442,5443,
+5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456,5457,5458,
+5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472,5473,
+5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488,
+5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,
+5504,5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,
+5519,5520,5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,
+5534,5535,5536,5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,
+5549,5550,5551,5552,5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,
+5564,5565,5566,5567,5568,5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,
+5579,5580,5581,5582,5583,5584,5585,5586,5587,5588,5589,5590,5591,5592,5593,
+5594,5595,5596,5597,5598,5599,5600,5601,5602,5603,5604,5605,5606,5607,5608,
+5609,5610,5611,5612,5613,5614,5615,5616,5617,5618,5619,5620,5621,5622,5623,
+5624,5625,5626,5627,5628,5629,5630,5631,5632,5633,5634,5635,5636,5637,5638,
+5639,5640,5641,5642,5643,5644,5645,5646,5647,5648,5649,5650,5651,5652,5653,
+5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664,5665,5666,5667,5668,
+5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680,5681,5682,5683,
+5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,
+5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712,5713,
+5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728,
+5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5741,5742,5743,
+5744,5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,
+5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,
+5774,5775,5776,5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5787,5788,
+5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,
+5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,
+5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,5830,5831,5832,5833,
+5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,5845,5846,5847,5848,
+5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860,5861,5862,5863,
+5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,5875,5876,5877,5878,
+5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,5890,5891,5892,5893,
+5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,5906,5907,5908,
+5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,5921,5922,5923,
+5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5938,
+5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952,5953,
+5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,
+5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,
+5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,
+5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,6010,6011,6012,6013,
+6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,
+6029,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,
+6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,
+6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,6069,6070,6071,6072,6073,
+6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,6085,6086,6087,6088,
+6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100,6101,6102,6103,
+6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116,6117,6118,
+6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,6132,6133,
+6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,6145,6146,6147,6148,
+6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,
+6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,
+6179,6180,6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,
+6194,6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,
+6209,6210,6211,6212,6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,
+6224,6225,6226,6227,6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,
+6239,6240,6241,6242,6243,6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,
+6254,6255,6256,6257,6258,6259,6260,6261,6262,6263,6264,6265,6266,6267,6268,
+6269,6270,6271,6272,6273,6274,6275,6276,6277,6278,6279,6280,6281,6282,6283,
+6284,6285,6286,6287,6288,6289,6290,6291,6292,6293,6294,6295,6296,6297,6298,
+6299,6300,6301,6302,6303,6304,6305,6306,6307,6308,6309,6310,6311,6312,6313,
+6314,6315,6316,6317,6318,6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,
+6329,6330,6331,6332,6333,6334,6335,6336,6337,6338,6339,6340,6341,6342,6343,
+6344,6345,6346,6347,6348,6349,6350,6351,6352,6353,6354,6355,6356,6357,6358,
+6359,6360,6361,6362,6363,6364,6365,6366,6367,6368,6369,6370,6371,6372,6373,
+6374,6375,6376,6377,6378,6379,6380,6381,6382,6383,6384,6385,6386,6387,6388,
+6389,6390,6391,6392,6393,6394,6395,6396,6397,6398,6399,6400,6401,6402,6403,
+6404,6405,6406,6407,6408,6409,6410,6411,6412,6413,6414,6415,6416,6417,6418,
+6419,6420,6421,6422,6423,6424,6425,6426,6427,6428,6429,6430,6431,6432,6433,
+6434,6435,6436,6437,6438,6439,6440,6441,6442,6443,6444,6445,6446,6447,6448,
+6449,6450,6451,6452,6453,6454,6455,6456,6457,6458,6459,6460,6461,6462,6463,
+6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474,6475,6476,6477,6478,
+6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,6489,6490,6491,6492,6493,
+6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,6504,6505,6506,6507,6508,
+6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,6520,6521,6522,6523,
+6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,6534,6535,6536,6537,6538,
+6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,6550,6551,6552,6553,
+6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,6565,6566,6567,6568,
+6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,6579,6580,6581,6582,6583,
+6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,6595,6596,6597,6598,
+6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,6609,6610,6611,6612,6613,
+6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,6624,6625,6626,6627,6628,
+6629,6630,6631,6632,6633,6634,6635,6636,6637,6638,6639,6640,6641,6642,6643,
+6644,6645,6646,6647,6648,6649,6650,6651,6652,6653,6654,6655,6656,6657,6658,
+6659,6660,6661,6662,6663,6664,6665,6666,6667,6668,6669,6670,6671,6672,6673,
+6674,6675,6676,6677,6678,6679,6680,6681,6682,6683,6684,6685,6686,6687,6688,
+6689,6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,6700,6701,6702,6703,
+6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715,6716,6717,6718,
+6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731,6732,6733,
+6734,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,6745,6746,6747,6748,
+6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761,6762,6763,
+6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777,6778,
+6779,6780,6781,6782,6783,6784,6785,6786,6787,6788,6789,6790,6791,6792,6793,
+6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806,6807,6808,
+6809,6810,6811,6812,6813,6814,6815,6816,6817,6818,6819,6820,6821,6822,6823,
+6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,6835,6836,6837,6838,
+6839,6840,6841,6842,6843,6844,6845,6846,6847,6848,6849,6850,6851,6852,6853,
+6854,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864,6865,6866,6867,6868,
+6869,6870,6871,6872,6873,6874,6875,6876,6877,6878,6879,6880,6881,6882,6883,
+6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894,6895,6896,6897,6898,
+6899,6900,6901,6902,6903,6904,6905,6906,6907,6908,6909,6910,6911,6912,6913,
+6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,6925,6926,6927,6928,
+6929,6930,6931,6932,6933,6934,6935,6936,6937,6938,6939,6940,6941,6942,6943,
+6944,6945,6946,6947,6948,6949,6950,6951,6952,6953,6954,6955,6956,6957,6958,
+6959,6960,6961,6962,6963,6964,6965,6966,6967,6968,6969,6970,6971,6972,6973,
+6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984,6985,6986,6987,6988,
+6989,6990,6991,6992,6993,6994,6995,6996,6997,6998,6999,7000,7001,7002,7003,
+7004,7005,7006,7007,7008,7009,7010,7011,7012,7013,7014,7015,7016,7017,7018,
+7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029,7030,7031,7032,7033,
+7034,7035,7036,7037,7038,7039,7040,7041,7042,7043,7044,7045,7046,7047,7048,
+7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059,7060,7061,7062,7063,
+7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,7075,7076,7077,7078,
+7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,7089,7090,7091,7092,7093,
+7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105,7106,7107,7108,
+7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,7120,7121,7122,7123,
+7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136,7137,7138,
+7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,
+7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167,7168,
+7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183,
+7184,7185,7186,7187,7188,7189,7190,7191,7192,7193,7194,7195,7196,7197,7198,
+7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213,
+7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,
+7229,7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,
+7244,7245,7246,7247,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,
+7259,7260,7261,7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,
+7274,7275,7276,7277,7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,
+7289,7290,7291,7292,7293,7294,7295,7296,7297,7298,7299,7300,7301,7302,7303,
+7304,7305,7306,7307,7308,7309,7310,7311,7312,7313,7314,7315,7316,7317,7318,
+7319,7320,7321,7322,7323,7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,
+7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,7344,7345,7346,7347,7348,
+7349,7350,7351,7352,7353,7354,7355,7356,7357,7358,7359,7360,7361,7362,7363,
+7364,7365,7366,7367,7368,7369,7370,7371,7372,7373,7374,7375,7376,7377,7378,
+7379,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,7392,7393,
+7394,7395,7396,7397,7398,7399,7400,7401,7402,7403,7404,7405,7406,7407,7408,
+7409,7410,7411,7412,7413,7414,7415,7416,7417,7418,7419,7420,7421,7422,7423,
+7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,7434,7435,7436,7437,7438,
+7439,7440,7441,7442,7443,7444,7445,7446,7447,7448,7449,7450,7451,7452,7453,
+7454,7455,7456,7457,7458,7459,7460,7461,7462,7463,7464,7465,7466,7467,7468,
+7469,7470,7471,7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7483,
+7484,7485,7486,7487,7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,
+7499,7500,7501,7502,7503,7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,
+7514,7515,7516,7517,7518,7519,7520,7521,7522,7523,7524,7525,7526,7527,7528,
+7529,7530,7531,7532,7533,7534,7535,7536,7537,7538,7539,7540,7541,7542,7543,
+7544,42877,7546,7547,7548,11363,7550,7551,7552,7553,7554,7555,7556,7557,
+7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,7568,7569,7570,7571,7572,
+7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,7583,7584,7585,7586,7587,
+7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,7600,7601,7602,
+7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,7616,7617,
+7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,7632,
+7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,
+7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,
+7663,7664,7665,7666,7667,7668,7669,7670,7671,7672,7673,7674,7675,7676,7677,
+7678,7679,7680,7680,7682,7682,7684,7684,7686,7686,7688,7688,7690,7690,7692,
+7692,7694,7694,7696,7696,7698,7698,7700,7700,7702,7702,7704,7704,7706,7706,
+7708,7708,7710,7710,7712,7712,7714,7714,7716,7716,7718,7718,7720,7720,7722,
+7722,7724,7724,7726,7726,7728,7728,7730,7730,7732,7732,7734,7734,7736,7736,
+7738,7738,7740,7740,7742,7742,7744,7744,7746,7746,7748,7748,7750,7750,7752,
+7752,7754,7754,7756,7756,7758,7758,7760,7760,7762,7762,7764,7764,7766,7766,
+7768,7768,7770,7770,7772,7772,7774,7774,7776,7776,7778,7778,7780,7780,7782,
+7782,7784,7784,7786,7786,7788,7788,7790,7790,7792,7792,7794,7794,7796,7796,
+7798,7798,7800,7800,7802,7802,7804,7804,7806,7806,7808,7808,7810,7810,7812,
+7812,7814,7814,7816,7816,7818,7818,7820,7820,7822,7822,7824,7824,7826,7826,
+7828,7828,7830,7831,7832,7833,7834,7776,7836,7837,7838,7839,7840,7840,7842,
+7842,7844,7844,7846,7846,7848,7848,7850,7850,7852,7852,7854,7854,7856,7856,
+7858,7858,7860,7860,7862,7862,7864,7864,7866,7866,7868,7868,7870,7870,7872,
+7872,7874,7874,7876,7876,7878,7878,7880,7880,7882,7882,7884,7884,7886,7886,
+7888,7888,7890,7890,7892,7892,7894,7894,7896,7896,7898,7898,7900,7900,7902,
+7902,7904,7904,7906,7906,7908,7908,7910,7910,7912,7912,7914,7914,7916,7916,
+7918,7918,7920,7920,7922,7922,7924,7924,7926,7926,7928,7928,7930,7930,7932,
+7932,7934,7934,7944,7945,7946,7947,7948,7949,7950,7951,7944,7945,7946,7947,
+7948,7949,7950,7951,7960,7961,7962,7963,7964,7965,7958,7959,7960,7961,7962,
+7963,7964,7965,7966,7967,7976,7977,7978,7979,7980,7981,7982,7983,7976,7977,
+7978,7979,7980,7981,7982,7983,7992,7993,7994,7995,7996,7997,7998,7999,7992,
+7993,7994,7995,7996,7997,7998,7999,8008,8009,8010,8011,8012,8013,8006,8007,
+8008,8009,8010,8011,8012,8013,8014,8015,8016,8025,8018,8027,8020,8029,8022,
+8031,8024,8025,8026,8027,8028,8029,8030,8031,8040,8041,8042,8043,8044,8045,
+8046,8047,8040,8041,8042,8043,8044,8045,8046,8047,8122,8123,8136,8137,8138,
+8139,8154,8155,8184,8185,8170,8171,8186,8187,8062,8063,8064,8065,8066,8067,
+8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080,8081,8082,
+8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,
+8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8120,
+8121,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,921,8127,
+8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,
+8143,8152,8153,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,
+8158,8159,8168,8169,8162,8163,8164,8172,8166,8167,8168,8169,8170,8171,8172,
+8173,8174,8175,8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,
+8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,
+8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,
+8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229,8230,8231,8232,
+8233,8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245,8246,8247,
+8248,8249,8250,8251,8252,8253,8254,8255,8256,8257,8258,8259,8260,8261,8262,
+8263,8264,8265,8266,8267,8268,8269,8270,8271,8272,8273,8274,8275,8276,8277,
+8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,8290,8291,8292,
+8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,
+8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,
+8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337,
+8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,
+8353,8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,
+8368,8369,8370,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382,
+8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,
+8398,8399,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,
+8413,8414,8415,8416,8417,8418,8419,8420,8421,8422,8423,8424,8425,8426,8427,
+8428,8429,8430,8431,8432,8433,8434,8435,8436,8437,8438,8439,8440,8441,8442,
+8443,8444,8445,8446,8447,8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,
+8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8468,8469,8470,8471,8472,
+8473,8474,8475,8476,8477,8478,8479,8480,8481,8482,8483,8484,8485,8486,8487,
+8488,8489,8490,8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,
+8503,8504,8505,8506,8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517,
+8518,8519,8520,8521,8522,8523,8524,8525,8498,8527,8528,8529,8530,8531,8532,
+8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,
+8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8544,8545,8546,
+8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8576,8577,
+8578,8579,8579,8581,8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,8592,
+8593,8594,8595,8596,8597,8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,
+8608,8609,8610,8611,8612,8613,8614,8615,8616,8617,8618,8619,8620,8621,8622,
+8623,8624,8625,8626,8627,8628,8629,8630,8631,8632,8633,8634,8635,8636,8637,
+8638,8639,8640,8641,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,
+8653,8654,8655,8656,8657,8658,8659,8660,8661,8662,8663,8664,8665,8666,8667,
+8668,8669,8670,8671,8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,
+8683,8684,8685,8686,8687,8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,
+8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,8708,8709,8710,8711,8712,
+8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725,8726,8727,
+8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,8738,8739,8740,8741,8742,
+8743,8744,8745,8746,8747,8748,8749,8750,8751,8752,8753,8754,8755,8756,8757,
+8758,8759,8760,8761,8762,8763,8764,8765,8766,8767,8768,8769,8770,8771,8772,
+8773,8774,8775,8776,8777,8778,8779,8780,8781,8782,8783,8784,8785,8786,8787,
+8788,8789,8790,8791,8792,8793,8794,8795,8796,8797,8798,8799,8800,8801,8802,
+8803,8804,8805,8806,8807,8808,8809,8810,8811,8812,8813,8814,8815,8816,8817,
+8818,8819,8820,8821,8822,8823,8824,8825,8826,8827,8828,8829,8830,8831,8832,
+8833,8834,8835,8836,8837,8838,8839,8840,8841,8842,8843,8844,8845,8846,8847,
+8848,8849,8850,8851,8852,8853,8854,8855,8856,8857,8858,8859,8860,8861,8862,
+8863,8864,8865,8866,8867,8868,8869,8870,8871,8872,8873,8874,8875,8876,8877,
+8878,8879,8880,8881,8882,8883,8884,8885,8886,8887,8888,8889,8890,8891,8892,
+8893,8894,8895,8896,8897,8898,8899,8900,8901,8902,8903,8904,8905,8906,8907,
+8908,8909,8910,8911,8912,8913,8914,8915,8916,8917,8918,8919,8920,8921,8922,
+8923,8924,8925,8926,8927,8928,8929,8930,8931,8932,8933,8934,8935,8936,8937,
+8938,8939,8940,8941,8942,8943,8944,8945,8946,8947,8948,8949,8950,8951,8952,
+8953,8954,8955,8956,8957,8958,8959,8960,8961,8962,8963,8964,8965,8966,8967,
+8968,8969,8970,8971,8972,8973,8974,8975,8976,8977,8978,8979,8980,8981,8982,
+8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,8993,8994,8995,8996,8997,
+8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008,9009,9010,9011,9012,
+9013,9014,9015,9016,9017,9018,9019,9020,9021,9022,9023,9024,9025,9026,9027,
+9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,9038,9039,9040,9041,9042,
+9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,9053,9054,9055,9056,9057,
+9058,9059,9060,9061,9062,9063,9064,9065,9066,9067,9068,9069,9070,9071,9072,
+9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,9083,9084,9085,9086,9087,
+9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9101,9102,
+9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,9113,9114,9115,9116,9117,
+9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,9128,9129,9130,9131,9132,
+9133,9134,9135,9136,9137,9138,9139,9140,9141,9142,9143,9144,9145,9146,9147,
+9148,9149,9150,9151,9152,9153,9154,9155,9156,9157,9158,9159,9160,9161,9162,
+9163,9164,9165,9166,9167,9168,9169,9170,9171,9172,9173,9174,9175,9176,9177,
+9178,9179,9180,9181,9182,9183,9184,9185,9186,9187,9188,9189,9190,9191,9192,
+9193,9194,9195,9196,9197,9198,9199,9200,9201,9202,9203,9204,9205,9206,9207,
+9208,9209,9210,9211,9212,9213,9214,9215,9216,9217,9218,9219,9220,9221,9222,
+9223,9224,9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,
+9238,9239,9240,9241,9242,9243,9244,9245,9246,9247,9248,9249,9250,9251,9252,
+9253,9254,9255,9256,9257,9258,9259,9260,9261,9262,9263,9264,9265,9266,9267,
+9268,9269,9270,9271,9272,9273,9274,9275,9276,9277,9278,9279,9280,9281,9282,
+9283,9284,9285,9286,9287,9288,9289,9290,9291,9292,9293,9294,9295,9296,9297,
+9298,9299,9300,9301,9302,9303,9304,9305,9306,9307,9308,9309,9310,9311,9312,
+9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,9327,
+9328,9329,9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,
+9343,9344,9345,9346,9347,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,
+9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,
+9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383,9384,9385,9386,9387,
+9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,
+9403,9404,9405,9406,9407,9408,9409,9410,9411,9412,9413,9414,9415,9416,9417,
+9418,9419,9420,9421,9422,9423,9398,9399,9400,9401,9402,9403,9404,9405,9406,
+9407,9408,9409,9410,9411,9412,9413,9414,9415,9416,9417,9418,9419,9420,9421,
+9422,9423,9450,9451,9452,9453,9454,9455,9456,9457,9458,9459,9460,9461,9462,
+9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,9473,9474,9475,9476,9477,
+9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,
+9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,
+9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,
+9523,9524,9525,9526,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,
+9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,9548,9549,9550,9551,9552,
+9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,
+9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,
+9583,9584,9585,9586,9587,9588,9589,9590,9591,9592,9593,9594,9595,9596,9597,
+9598,9599,9600,9601,9602,9603,9604,9605,9606,9607,9608,9609,9610,9611,9612,
+9613,9614,9615,9616,9617,9618,9619,9620,9621,9622,9623,9624,9625,9626,9627,
+9628,9629,9630,9631,9632,9633,9634,9635,9636,9637,9638,9639,9640,9641,9642,
+9643,9644,9645,9646,9647,9648,9649,9650,9651,9652,9653,9654,9655,9656,9657,
+9658,9659,9660,9661,9662,9663,9664,9665,9666,9667,9668,9669,9670,9671,9672,
+9673,9674,9675,9676,9677,9678,9679,9680,9681,9682,9683,9684,9685,9686,9687,
+9688,9689,9690,9691,9692,9693,9694,9695,9696,9697,9698,9699,9700,9701,9702,
+9703,9704,9705,9706,9707,9708,9709,9710,9711,9712,9713,9714,9715,9716,9717,
+9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,9728,9729,9730,9731,9732,
+9733,9734,9735,9736,9737,9738,9739,9740,9741,9742,9743,9744,9745,9746,9747,
+9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,9758,9759,9760,9761,9762,
+9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,9773,9774,9775,9776,9777,
+9778,9779,9780,9781,9782,9783,9784,9785,9786,9787,9788,9789,9790,9791,9792,
+9793,9794,9795,9796,9797,9798,9799,9800,9801,9802,9803,9804,9805,9806,9807,
+9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,9818,9819,9820,9821,9822,
+9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,9833,9834,9835,9836,9837,
+9838,9839,9840,9841,9842,9843,9844,9845,9846,9847,9848,9849,9850,9851,9852,
+9853,9854,9855,9856,9857,9858,9859,9860,9861,9862,9863,9864,9865,9866,9867,
+9868,9869,9870,9871,9872,9873,9874,9875,9876,9877,9878,9879,9880,9881,9882,
+9883,9884,9885,9886,9887,9888,9889,9890,9891,9892,9893,9894,9895,9896,9897,
+9898,9899,9900,9901,9902,9903,9904,9905,9906,9907,9908,9909,9910,9911,9912,
+9913,9914,9915,9916,9917,9918,9919,9920,9921,9922,9923,9924,9925,9926,9927,
+9928,9929,9930,9931,9932,9933,9934,9935,9936,9937,9938,9939,9940,9941,9942,
+9943,9944,9945,9946,9947,9948,9949,9950,9951,9952,9953,9954,9955,9956,9957,
+9958,9959,9960,9961,9962,9963,9964,9965,9966,9967,9968,9969,9970,9971,9972,
+9973,9974,9975,9976,9977,9978,9979,9980,9981,9982,9983,9984,9985,9986,9987,
+9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,10000,10001,
+10002,10003,10004,10005,10006,10007,10008,10009,10010,10011,10012,10013,
+10014,10015,10016,10017,10018,10019,10020,10021,10022,10023,10024,10025,
+10026,10027,10028,10029,10030,10031,10032,10033,10034,10035,10036,10037,
+10038,10039,10040,10041,10042,10043,10044,10045,10046,10047,10048,10049,
+10050,10051,10052,10053,10054,10055,10056,10057,10058,10059,10060,10061,
+10062,10063,10064,10065,10066,10067,10068,10069,10070,10071,10072,10073,
+10074,10075,10076,10077,10078,10079,10080,10081,10082,10083,10084,10085,
+10086,10087,10088,10089,10090,10091,10092,10093,10094,10095,10096,10097,
+10098,10099,10100,10101,10102,10103,10104,10105,10106,10107,10108,10109,
+10110,10111,10112,10113,10114,10115,10116,10117,10118,10119,10120,10121,
+10122,10123,10124,10125,10126,10127,10128,10129,10130,10131,10132,10133,
+10134,10135,10136,10137,10138,10139,10140,10141,10142,10143,10144,10145,
+10146,10147,10148,10149,10150,10151,10152,10153,10154,10155,10156,10157,
+10158,10159,10160,10161,10162,10163,10164,10165,10166,10167,10168,10169,
+10170,10171,10172,10173,10174,10175,10176,10177,10178,10179,10180,10181,
+10182,10183,10184,10185,10186,10187,10188,10189,10190,10191,10192,10193,
+10194,10195,10196,10197,10198,10199,10200,10201,10202,10203,10204,10205,
+10206,10207,10208,10209,10210,10211,10212,10213,10214,10215,10216,10217,
+10218,10219,10220,10221,10222,10223,10224,10225,10226,10227,10228,10229,
+10230,10231,10232,10233,10234,10235,10236,10237,10238,10239,10240,10241,
+10242,10243,10244,10245,10246,10247,10248,10249,10250,10251,10252,10253,
+10254,10255,10256,10257,10258,10259,10260,10261,10262,10263,10264,10265,
+10266,10267,10268,10269,10270,10271,10272,10273,10274,10275,10276,10277,
+10278,10279,10280,10281,10282,10283,10284,10285,10286,10287,10288,10289,
+10290,10291,10292,10293,10294,10295,10296,10297,10298,10299,10300,10301,
+10302,10303,10304,10305,10306,10307,10308,10309,10310,10311,10312,10313,
+10314,10315,10316,10317,10318,10319,10320,10321,10322,10323,10324,10325,
+10326,10327,10328,10329,10330,10331,10332,10333,10334,10335,10336,10337,
+10338,10339,10340,10341,10342,10343,10344,10345,10346,10347,10348,10349,
+10350,10351,10352,10353,10354,10355,10356,10357,10358,10359,10360,10361,
+10362,10363,10364,10365,10366,10367,10368,10369,10370,10371,10372,10373,
+10374,10375,10376,10377,10378,10379,10380,10381,10382,10383,10384,10385,
+10386,10387,10388,10389,10390,10391,10392,10393,10394,10395,10396,10397,
+10398,10399,10400,10401,10402,10403,10404,10405,10406,10407,10408,10409,
+10410,10411,10412,10413,10414,10415,10416,10417,10418,10419,10420,10421,
+10422,10423,10424,10425,10426,10427,10428,10429,10430,10431,10432,10433,
+10434,10435,10436,10437,10438,10439,10440,10441,10442,10443,10444,10445,
+10446,10447,10448,10449,10450,10451,10452,10453,10454,10455,10456,10457,
+10458,10459,10460,10461,10462,10463,10464,10465,10466,10467,10468,10469,
+10470,10471,10472,10473,10474,10475,10476,10477,10478,10479,10480,10481,
+10482,10483,10484,10485,10486,10487,10488,10489,10490,10491,10492,10493,
+10494,10495,10496,10497,10498,10499,10500,10501,10502,10503,10504,10505,
+10506,10507,10508,10509,10510,10511,10512,10513,10514,10515,10516,10517,
+10518,10519,10520,10521,10522,10523,10524,10525,10526,10527,10528,10529,
+10530,10531,10532,10533,10534,10535,10536,10537,10538,10539,10540,10541,
+10542,10543,10544,10545,10546,10547,10548,10549,10550,10551,10552,10553,
+10554,10555,10556,10557,10558,10559,10560,10561,10562,10563,10564,10565,
+10566,10567,10568,10569,10570,10571,10572,10573,10574,10575,10576,10577,
+10578,10579,10580,10581,10582,10583,10584,10585,10586,10587,10588,10589,
+10590,10591,10592,10593,10594,10595,10596,10597,10598,10599,10600,10601,
+10602,10603,10604,10605,10606,10607,10608,10609,10610,10611,10612,10613,
+10614,10615,10616,10617,10618,10619,10620,10621,10622,10623,10624,10625,
+10626,10627,10628,10629,10630,10631,10632,10633,10634,10635,10636,10637,
+10638,10639,10640,10641,10642,10643,10644,10645,10646,10647,10648,10649,
+10650,10651,10652,10653,10654,10655,10656,10657,10658,10659,10660,10661,
+10662,10663,10664,10665,10666,10667,10668,10669,10670,10671,10672,10673,
+10674,10675,10676,10677,10678,10679,10680,10681,10682,10683,10684,10685,
+10686,10687,10688,10689,10690,10691,10692,10693,10694,10695,10696,10697,
+10698,10699,10700,10701,10702,10703,10704,10705,10706,10707,10708,10709,
+10710,10711,10712,10713,10714,10715,10716,10717,10718,10719,10720,10721,
+10722,10723,10724,10725,10726,10727,10728,10729,10730,10731,10732,10733,
+10734,10735,10736,10737,10738,10739,10740,10741,10742,10743,10744,10745,
+10746,10747,10748,10749,10750,10751,10752,10753,10754,10755,10756,10757,
+10758,10759,10760,10761,10762,10763,10764,10765,10766,10767,10768,10769,
+10770,10771,10772,10773,10774,10775,10776,10777,10778,10779,10780,10781,
+10782,10783,10784,10785,10786,10787,10788,10789,10790,10791,10792,10793,
+10794,10795,10796,10797,10798,10799,10800,10801,10802,10803,10804,10805,
+10806,10807,10808,10809,10810,10811,10812,10813,10814,10815,10816,10817,
+10818,10819,10820,10821,10822,10823,10824,10825,10826,10827,10828,10829,
+10830,10831,10832,10833,10834,10835,10836,10837,10838,10839,10840,10841,
+10842,10843,10844,10845,10846,10847,10848,10849,10850,10851,10852,10853,
+10854,10855,10856,10857,10858,10859,10860,10861,10862,10863,10864,10865,
+10866,10867,10868,10869,10870,10871,10872,10873,10874,10875,10876,10877,
+10878,10879,10880,10881,10882,10883,10884,10885,10886,10887,10888,10889,
+10890,10891,10892,10893,10894,10895,10896,10897,10898,10899,10900,10901,
+10902,10903,10904,10905,10906,10907,10908,10909,10910,10911,10912,10913,
+10914,10915,10916,10917,10918,10919,10920,10921,10922,10923,10924,10925,
+10926,10927,10928,10929,10930,10931,10932,10933,10934,10935,10936,10937,
+10938,10939,10940,10941,10942,10943,10944,10945,10946,10947,10948,10949,
+10950,10951,10952,10953,10954,10955,10956,10957,10958,10959,10960,10961,
+10962,10963,10964,10965,10966,10967,10968,10969,10970,10971,10972,10973,
+10974,10975,10976,10977,10978,10979,10980,10981,10982,10983,10984,10985,
+10986,10987,10988,10989,10990,10991,10992,10993,10994,10995,10996,10997,
+10998,10999,11000,11001,11002,11003,11004,11005,11006,11007,11008,11009,
+11010,11011,11012,11013,11014,11015,11016,11017,11018,11019,11020,11021,
+11022,11023,11024,11025,11026,11027,11028,11029,11030,11031,11032,11033,
+11034,11035,11036,11037,11038,11039,11040,11041,11042,11043,11044,11045,
+11046,11047,11048,11049,11050,11051,11052,11053,11054,11055,11056,11057,
+11058,11059,11060,11061,11062,11063,11064,11065,11066,11067,11068,11069,
+11070,11071,11072,11073,11074,11075,11076,11077,11078,11079,11080,11081,
+11082,11083,11084,11085,11086,11087,11088,11089,11090,11091,11092,11093,
+11094,11095,11096,11097,11098,11099,11100,11101,11102,11103,11104,11105,
+11106,11107,11108,11109,11110,11111,11112,11113,11114,11115,11116,11117,
+11118,11119,11120,11121,11122,11123,11124,11125,11126,11127,11128,11129,
+11130,11131,11132,11133,11134,11135,11136,11137,11138,11139,11140,11141,
+11142,11143,11144,11145,11146,11147,11148,11149,11150,11151,11152,11153,
+11154,11155,11156,11157,11158,11159,11160,11161,11162,11163,11164,11165,
+11166,11167,11168,11169,11170,11171,11172,11173,11174,11175,11176,11177,
+11178,11179,11180,11181,11182,11183,11184,11185,11186,11187,11188,11189,
+11190,11191,11192,11193,11194,11195,11196,11197,11198,11199,11200,11201,
+11202,11203,11204,11205,11206,11207,11208,11209,11210,11211,11212,11213,
+11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225,
+11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,
+11238,11239,11240,11241,11242,11243,11244,11245,11246,11247,11248,11249,
+11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,
+11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272,11273,
+11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,
+11286,11287,11288,11289,11290,11291,11292,11293,11294,11295,11296,11297,
+11298,11299,11300,11301,11302,11303,11304,11305,11306,11307,11308,11309,
+11310,11311,11264,11265,11266,11267,11268,11269,11270,11271,11272,11273,
+11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,
+11286,11287,11288,11289,11290,11291,11292,11293,11294,11295,11296,11297,
+11298,11299,11300,11301,11302,11303,11304,11305,11306,11307,11308,11309,
+11310,11359,11360,11360,11362,11363,11364,570,574,11367,11367,11369,11369,
+11371,11371,11373,11374,11375,11376,11377,11378,11378,11380,11381,11381,
+11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11392,11394,
+11394,11396,11396,11398,11398,11400,11400,11402,11402,11404,11404,11406,
+11406,11408,11408,11410,11410,11412,11412,11414,11414,11416,11416,11418,
+11418,11420,11420,11422,11422,11424,11424,11426,11426,11428,11428,11430,
+11430,11432,11432,11434,11434,11436,11436,11438,11438,11440,11440,11442,
+11442,11444,11444,11446,11446,11448,11448,11450,11450,11452,11452,11454,
+11454,11456,11456,11458,11458,11460,11460,11462,11462,11464,11464,11466,
+11466,11468,11468,11470,11470,11472,11472,11474,11474,11476,11476,11478,
+11478,11480,11480,11482,11482,11484,11484,11486,11486,11488,11488,11490,
+11490,11492,11493,11494,11495,11496,11497,11498,11499,11499,11501,11501,
+11503,11504,11505,11506,11507,11508,11509,11510,11511,11512,11513,11514,
+11515,11516,11517,11518,11519,4256,4257,4258,4259,4260,4261,4262,4263,4264,
+4265,4266,4267,4268,4269,4270,4271,4272,4273,4274,4275,4276,4277,4278,4279,
+4280,4281,4282,4283,4284,4285,4286,4287,4288,4289,4290,4291,4292,4293,
+11558,11559,11560,11561,11562,11563,11564,11565,11566,11567,11568,11569,
+11570,11571,11572,11573,11574,11575,11576,11577,11578,11579,11580,11581,
+11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,11592,11593,
+11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,11605,
+11606,11607,11608,11609,11610,11611,11612,11613,11614,11615,11616,11617,
+11618,11619,11620,11621,11622,11623,11624,11625,11626,11627,11628,11629,
+11630,11631,11632,11633,11634,11635,11636,11637,11638,11639,11640,11641,
+11642,11643,11644,11645,11646,11647,11648,11649,11650,11651,11652,11653,
+11654,11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,
+11666,11667,11668,11669,11670,11671,11672,11673,11674,11675,11676,11677,
+11678,11679,11680,11681,11682,11683,11684,11685,11686,11687,11688,11689,
+11690,11691,11692,11693,11694,11695,11696,11697,11698,11699,11700,11701,
+11702,11703,11704,11705,11706,11707,11708,11709,11710,11711,11712,11713,
+11714,11715,11716,11717,11718,11719,11720,11721,11722,11723,11724,11725,
+11726,11727,11728,11729,11730,11731,11732,11733,11734,11735,11736,11737,
+11738,11739,11740,11741,11742,11743,11744,11745,11746,11747,11748,11749,
+11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,
+11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,
+11774,11775,11776,11777,11778,11779,11780,11781,11782,11783,11784,11785,
+11786,11787,11788,11789,11790,11791,11792,11793,11794,11795,11796,11797,
+11798,11799,11800,11801,11802,11803,11804,11805,11806,11807,11808,11809,
+11810,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821,
+11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,
+11834,11835,11836,11837,11838,11839,11840,11841,11842,11843,11844,11845,
+11846,11847,11848,11849,11850,11851,11852,11853,11854,11855,11856,11857,
+11858,11859,11860,11861,11862,11863,11864,11865,11866,11867,11868,11869,
+11870,11871,11872,11873,11874,11875,11876,11877,11878,11879,11880,11881,
+11882,11883,11884,11885,11886,11887,11888,11889,11890,11891,11892,11893,
+11894,11895,11896,11897,11898,11899,11900,11901,11902,11903,11904,11905,
+11906,11907,11908,11909,11910,11911,11912,11913,11914,11915,11916,11917,
+11918,11919,11920,11921,11922,11923,11924,11925,11926,11927,11928,11929,
+11930,11931,11932,11933,11934,11935,11936,11937,11938,11939,11940,11941,
+11942,11943,11944,11945,11946,11947,11948,11949,11950,11951,11952,11953,
+11954,11955,11956,11957,11958,11959,11960,11961,11962,11963,11964,11965,
+11966,11967,11968,11969,11970,11971,11972,11973,11974,11975,11976,11977,
+11978,11979,11980,11981,11982,11983,11984,11985,11986,11987,11988,11989,
+11990,11991,11992,11993,11994,11995,11996,11997,11998,11999,12000,12001,
+12002,12003,12004,12005,12006,12007,12008,12009,12010,12011,12012,12013,
+12014,12015,12016,12017,12018,12019,12020,12021,12022,12023,12024,12025,
+12026,12027,12028,12029,12030,12031,12032,12033,12034,12035,12036,12037,
+12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,
+12050,12051,12052,12053,12054,12055,12056,12057,12058,12059,12060,12061,
+12062,12063,12064,12065,12066,12067,12068,12069,12070,12071,12072,12073,
+12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084,12085,
+12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,
+12098,12099,12100,12101,12102,12103,12104,12105,12106,12107,12108,12109,
+12110,12111,12112,12113,12114,12115,12116,12117,12118,12119,12120,12121,
+12122,12123,12124,12125,12126,12127,12128,12129,12130,12131,12132,12133,
+12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,
+12146,12147,12148,12149,12150,12151,12152,12153,12154,12155,12156,12157,
+12158,12159,12160,12161,12162,12163,12164,12165,12166,12167,12168,12169,
+12170,12171,12172,12173,12174,12175,12176,12177,12178,12179,12180,12181,
+12182,12183,12184,12185,12186,12187,12188,12189,12190,12191,12192,12193,
+12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204,12205,
+12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,
+12218,12219,12220,12221,12222,12223,12224,12225,12226,12227,12228,12229,
+12230,12231,12232,12233,12234,12235,12236,12237,12238,12239,12240,12241,
+12242,12243,12244,12245,12246,12247,12248,12249,12250,12251,12252,12253,
+12254,12255,12256,12257,12258,12259,12260,12261,12262,12263,12264,12265,
+12266,12267,12268,12269,12270,12271,12272,12273,12274,12275,12276,12277,
+12278,12279,12280,12281,12282,12283,12284,12285,12286,12287,12288,12289,
+12290,12291,12292,12293,12294,12295,12296,12297,12298,12299,12300,12301,
+12302,12303,12304,12305,12306,12307,12308,12309,12310,12311,12312,12313,
+12314,12315,12316,12317,12318,12319,12320,12321,12322,12323,12324,12325,
+12326,12327,12328,12329,12330,12331,12332,12333,12334,12335,12336,12337,
+12338,12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,
+12350,12351,12352,12353,12354,12355,12356,12357,12358,12359,12360,12361,
+12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,
+12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,
+12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,
+12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,
+12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,
+12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,
+12434,12435,12436,12437,12438,12439,12440,12441,12442,12443,12444,12445,
+12446,12447,12448,12449,12450,12451,12452,12453,12454,12455,12456,12457,
+12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,
+12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,
+12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,
+12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,
+12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,
+12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,
+12530,12531,12532,12533,12534,12535,12536,12537,12538,12539,12540,12541,
+12542,12543,12544,12545,12546,12547,12548,12549,12550,12551,12552,12553,
+12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,
+12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,
+12578,12579,12580,12581,12582,12583,12584,12585,12586,12587,12588,12589,
+12590,12591,12592,12593,12594,12595,12596,12597,12598,12599,12600,12601,
+12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,
+12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,
+12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,
+12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,
+12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,
+12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,
+12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,
+12686,12687,12688,12689,12690,12691,12692,12693,12694,12695,12696,12697,
+12698,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,
+12710,12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,
+12722,12723,12724,12725,12726,12727,12728,12729,12730,12731,12732,12733,
+12734,12735,12736,12737,12738,12739,12740,12741,12742,12743,12744,12745,
+12746,12747,12748,12749,12750,12751,12752,12753,12754,12755,12756,12757,
+12758,12759,12760,12761,12762,12763,12764,12765,12766,12767,12768,12769,
+12770,12771,12772,12773,12774,12775,12776,12777,12778,12779,12780,12781,
+12782,12783,12784,12785,12786,12787,12788,12789,12790,12791,12792,12793,
+12794,12795,12796,12797,12798,12799,12800,12801,12802,12803,12804,12805,
+12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,
+12818,12819,12820,12821,12822,12823,12824,12825,12826,12827,12828,12829,
+12830,12831,12832,12833,12834,12835,12836,12837,12838,12839,12840,12841,
+12842,12843,12844,12845,12846,12847,12848,12849,12850,12851,12852,12853,
+12854,12855,12856,12857,12858,12859,12860,12861,12862,12863,12864,12865,
+12866,12867,12868,12869,12870,12871,12872,12873,12874,12875,12876,12877,
+12878,12879,12880,12881,12882,12883,12884,12885,12886,12887,12888,12889,
+12890,12891,12892,12893,12894,12895,12896,12897,12898,12899,12900,12901,
+12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912,12913,
+12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,
+12926,12927,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,
+12938,12939,12940,12941,12942,12943,12944,12945,12946,12947,12948,12949,
+12950,12951,12952,12953,12954,12955,12956,12957,12958,12959,12960,12961,
+12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973,
+12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,
+12986,12987,12988,12989,12990,12991,12992,12993,12994,12995,12996,12997,
+12998,12999,13000,13001,13002,13003,13004,13005,13006,13007,13008,13009,
+13010,13011,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,
+13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,
+13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,
+13046,13047,13048,13049,13050,13051,13052,13053,13054,13055,13056,13057,
+13058,13059,13060,13061,13062,13063,13064,13065,13066,13067,13068,13069,
+13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081,
+13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,
+13094,13095,13096,13097,13098,13099,13100,13101,13102,13103,13104,13105,
+13106,13107,13108,13109,13110,13111,13112,13113,13114,13115,13116,13117,
+13118,13119,13120,13121,13122,13123,13124,13125,13126,13127,13128,13129,
+13130,13131,13132,13133,13134,13135,13136,13137,13138,13139,13140,13141,
+13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,
+13154,13155,13156,13157,13158,13159,13160,13161,13162,13163,13164,13165,
+13166,13167,13168,13169,13170,13171,13172,13173,13174,13175,13176,13177,
+13178,13179,13180,13181,13182,13183,13184,13185,13186,13187,13188,13189,
+13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201,
+13202,13203,13204,13205,13206,13207,13208,13209,13210,13211,13212,13213,
+13214,13215,13216,13217,13218,13219,13220,13221,13222,13223,13224,13225,
+13226,13227,13228,13229,13230,13231,13232,13233,13234,13235,13236,13237,
+13238,13239,13240,13241,13242,13243,13244,13245,13246,13247,13248,13249,
+13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260,13261,
+13262,13263,13264,13265,13266,13267,13268,13269,13270,13271,13272,13273,
+13274,13275,13276,13277,13278,13279,13280,13281,13282,13283,13284,13285,
+13286,13287,13288,13289,13290,13291,13292,13293,13294,13295,13296,13297,
+13298,13299,13300,13301,13302,13303,13304,13305,13306,13307,13308,13309,
+13310,13311,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321,
+13322,13323,13324,13325,13326,13327,13328,13329,13330,13331,13332,13333,
+13334,13335,13336,13337,13338,13339,13340,13341,13342,13343,13344,13345,
+13346,13347,13348,13349,13350,13351,13352,13353,13354,13355,13356,13357,
+13358,13359,13360,13361,13362,13363,13364,13365,13366,13367,13368,13369,
+13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,
+13382,13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,
+13394,13395,13396,13397,13398,13399,13400,13401,13402,13403,13404,13405,
+13406,13407,13408,13409,13410,13411,13412,13413,13414,13415,13416,13417,
+13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,
+13430,13431,13432,13433,13434,13435,13436,13437,13438,13439,13440,13441,
+13442,13443,13444,13445,13446,13447,13448,13449,13450,13451,13452,13453,
+13454,13455,13456,13457,13458,13459,13460,13461,13462,13463,13464,13465,
+13466,13467,13468,13469,13470,13471,13472,13473,13474,13475,13476,13477,
+13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,
+13490,13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,
+13502,13503,13504,13505,13506,13507,13508,13509,13510,13511,13512,13513,
+13514,13515,13516,13517,13518,13519,13520,13521,13522,13523,13524,13525,
+13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,
+13538,13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,
+13550,13551,13552,13553,13554,13555,13556,13557,13558,13559,13560,13561,
+13562,13563,13564,13565,13566,13567,13568,13569,13570,13571,13572,13573,
+13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,
+13586,13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,
+13598,13599,13600,13601,13602,13603,13604,13605,13606,13607,13608,13609,
+13610,13611,13612,13613,13614,13615,13616,13617,13618,13619,13620,13621,
+13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,
+13634,13635,13636,13637,13638,13639,13640,13641,13642,13643,13644,13645,
+13646,13647,13648,13649,13650,13651,13652,13653,13654,13655,13656,13657,
+13658,13659,13660,13661,13662,13663,13664,13665,13666,13667,13668,13669,
+13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680,13681,
+13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,
+13694,13695,13696,13697,13698,13699,13700,13701,13702,13703,13704,13705,
+13706,13707,13708,13709,13710,13711,13712,13713,13714,13715,13716,13717,
+13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728,13729,
+13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,
+13742,13743,13744,13745,13746,13747,13748,13749,13750,13751,13752,13753,
+13754,13755,13756,13757,13758,13759,13760,13761,13762,13763,13764,13765,
+13766,13767,13768,13769,13770,13771,13772,13773,13774,13775,13776,13777,
+13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,
+13790,13791,13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,
+13802,13803,13804,13805,13806,13807,13808,13809,13810,13811,13812,13813,
+13814,13815,13816,13817,13818,13819,13820,13821,13822,13823,13824,13825,
+13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,
+13838,13839,13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,
+13850,13851,13852,13853,13854,13855,13856,13857,13858,13859,13860,13861,
+13862,13863,13864,13865,13866,13867,13868,13869,13870,13871,13872,13873,
+13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,
+13886,13887,13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,
+13898,13899,13900,13901,13902,13903,13904,13905,13906,13907,13908,13909,
+13910,13911,13912,13913,13914,13915,13916,13917,13918,13919,13920,13921,
+13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,
+13934,13935,13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,
+13946,13947,13948,13949,13950,13951,13952,13953,13954,13955,13956,13957,
+13958,13959,13960,13961,13962,13963,13964,13965,13966,13967,13968,13969,
+13970,13971,13972,13973,13974,13975,13976,13977,13978,13979,13980,13981,
+13982,13983,13984,13985,13986,13987,13988,13989,13990,13991,13992,13993,
+13994,13995,13996,13997,13998,13999,14000,14001,14002,14003,14004,14005,
+14006,14007,14008,14009,14010,14011,14012,14013,14014,14015,14016,14017,
+14018,14019,14020,14021,14022,14023,14024,14025,14026,14027,14028,14029,
+14030,14031,14032,14033,14034,14035,14036,14037,14038,14039,14040,14041,
+14042,14043,14044,14045,14046,14047,14048,14049,14050,14051,14052,14053,
+14054,14055,14056,14057,14058,14059,14060,14061,14062,14063,14064,14065,
+14066,14067,14068,14069,14070,14071,14072,14073,14074,14075,14076,14077,
+14078,14079,14080,14081,14082,14083,14084,14085,14086,14087,14088,14089,
+14090,14091,14092,14093,14094,14095,14096,14097,14098,14099,14100,14101,
+14102,14103,14104,14105,14106,14107,14108,14109,14110,14111,14112,14113,
+14114,14115,14116,14117,14118,14119,14120,14121,14122,14123,14124,14125,
+14126,14127,14128,14129,14130,14131,14132,14133,14134,14135,14136,14137,
+14138,14139,14140,14141,14142,14143,14144,14145,14146,14147,14148,14149,
+14150,14151,14152,14153,14154,14155,14156,14157,14158,14159,14160,14161,
+14162,14163,14164,14165,14166,14167,14168,14169,14170,14171,14172,14173,
+14174,14175,14176,14177,14178,14179,14180,14181,14182,14183,14184,14185,
+14186,14187,14188,14189,14190,14191,14192,14193,14194,14195,14196,14197,
+14198,14199,14200,14201,14202,14203,14204,14205,14206,14207,14208,14209,
+14210,14211,14212,14213,14214,14215,14216,14217,14218,14219,14220,14221,
+14222,14223,14224,14225,14226,14227,14228,14229,14230,14231,14232,14233,
+14234,14235,14236,14237,14238,14239,14240,14241,14242,14243,14244,14245,
+14246,14247,14248,14249,14250,14251,14252,14253,14254,14255,14256,14257,
+14258,14259,14260,14261,14262,14263,14264,14265,14266,14267,14268,14269,
+14270,14271,14272,14273,14274,14275,14276,14277,14278,14279,14280,14281,
+14282,14283,14284,14285,14286,14287,14288,14289,14290,14291,14292,14293,
+14294,14295,14296,14297,14298,14299,14300,14301,14302,14303,14304,14305,
+14306,14307,14308,14309,14310,14311,14312,14313,14314,14315,14316,14317,
+14318,14319,14320,14321,14322,14323,14324,14325,14326,14327,14328,14329,
+14330,14331,14332,14333,14334,14335,14336,14337,14338,14339,14340,14341,
+14342,14343,14344,14345,14346,14347,14348,14349,14350,14351,14352,14353,
+14354,14355,14356,14357,14358,14359,14360,14361,14362,14363,14364,14365,
+14366,14367,14368,14369,14370,14371,14372,14373,14374,14375,14376,14377,
+14378,14379,14380,14381,14382,14383,14384,14385,14386,14387,14388,14389,
+14390,14391,14392,14393,14394,14395,14396,14397,14398,14399,14400,14401,
+14402,14403,14404,14405,14406,14407,14408,14409,14410,14411,14412,14413,
+14414,14415,14416,14417,14418,14419,14420,14421,14422,14423,14424,14425,
+14426,14427,14428,14429,14430,14431,14432,14433,14434,14435,14436,14437,
+14438,14439,14440,14441,14442,14443,14444,14445,14446,14447,14448,14449,
+14450,14451,14452,14453,14454,14455,14456,14457,14458,14459,14460,14461,
+14462,14463,14464,14465,14466,14467,14468,14469,14470,14471,14472,14473,
+14474,14475,14476,14477,14478,14479,14480,14481,14482,14483,14484,14485,
+14486,14487,14488,14489,14490,14491,14492,14493,14494,14495,14496,14497,
+14498,14499,14500,14501,14502,14503,14504,14505,14506,14507,14508,14509,
+14510,14511,14512,14513,14514,14515,14516,14517,14518,14519,14520,14521,
+14522,14523,14524,14525,14526,14527,14528,14529,14530,14531,14532,14533,
+14534,14535,14536,14537,14538,14539,14540,14541,14542,14543,14544,14545,
+14546,14547,14548,14549,14550,14551,14552,14553,14554,14555,14556,14557,
+14558,14559,14560,14561,14562,14563,14564,14565,14566,14567,14568,14569,
+14570,14571,14572,14573,14574,14575,14576,14577,14578,14579,14580,14581,
+14582,14583,14584,14585,14586,14587,14588,14589,14590,14591,14592,14593,
+14594,14595,14596,14597,14598,14599,14600,14601,14602,14603,14604,14605,
+14606,14607,14608,14609,14610,14611,14612,14613,14614,14615,14616,14617,
+14618,14619,14620,14621,14622,14623,14624,14625,14626,14627,14628,14629,
+14630,14631,14632,14633,14634,14635,14636,14637,14638,14639,14640,14641,
+14642,14643,14644,14645,14646,14647,14648,14649,14650,14651,14652,14653,
+14654,14655,14656,14657,14658,14659,14660,14661,14662,14663,14664,14665,
+14666,14667,14668,14669,14670,14671,14672,14673,14674,14675,14676,14677,
+14678,14679,14680,14681,14682,14683,14684,14685,14686,14687,14688,14689,
+14690,14691,14692,14693,14694,14695,14696,14697,14698,14699,14700,14701,
+14702,14703,14704,14705,14706,14707,14708,14709,14710,14711,14712,14713,
+14714,14715,14716,14717,14718,14719,14720,14721,14722,14723,14724,14725,
+14726,14727,14728,14729,14730,14731,14732,14733,14734,14735,14736,14737,
+14738,14739,14740,14741,14742,14743,14744,14745,14746,14747,14748,14749,
+14750,14751,14752,14753,14754,14755,14756,14757,14758,14759,14760,14761,
+14762,14763,14764,14765,14766,14767,14768,14769,14770,14771,14772,14773,
+14774,14775,14776,14777,14778,14779,14780,14781,14782,14783,14784,14785,
+14786,14787,14788,14789,14790,14791,14792,14793,14794,14795,14796,14797,
+14798,14799,14800,14801,14802,14803,14804,14805,14806,14807,14808,14809,
+14810,14811,14812,14813,14814,14815,14816,14817,14818,14819,14820,14821,
+14822,14823,14824,14825,14826,14827,14828,14829,14830,14831,14832,14833,
+14834,14835,14836,14837,14838,14839,14840,14841,14842,14843,14844,14845,
+14846,14847,14848,14849,14850,14851,14852,14853,14854,14855,14856,14857,
+14858,14859,14860,14861,14862,14863,14864,14865,14866,14867,14868,14869,
+14870,14871,14872,14873,14874,14875,14876,14877,14878,14879,14880,14881,
+14882,14883,14884,14885,14886,14887,14888,14889,14890,14891,14892,14893,
+14894,14895,14896,14897,14898,14899,14900,14901,14902,14903,14904,14905,
+14906,14907,14908,14909,14910,14911,14912,14913,14914,14915,14916,14917,
+14918,14919,14920,14921,14922,14923,14924,14925,14926,14927,14928,14929,
+14930,14931,14932,14933,14934,14935,14936,14937,14938,14939,14940,14941,
+14942,14943,14944,14945,14946,14947,14948,14949,14950,14951,14952,14953,
+14954,14955,14956,14957,14958,14959,14960,14961,14962,14963,14964,14965,
+14966,14967,14968,14969,14970,14971,14972,14973,14974,14975,14976,14977,
+14978,14979,14980,14981,14982,14983,14984,14985,14986,14987,14988,14989,
+14990,14991,14992,14993,14994,14995,14996,14997,14998,14999,15000,15001,
+15002,15003,15004,15005,15006,15007,15008,15009,15010,15011,15012,15013,
+15014,15015,15016,15017,15018,15019,15020,15021,15022,15023,15024,15025,
+15026,15027,15028,15029,15030,15031,15032,15033,15034,15035,15036,15037,
+15038,15039,15040,15041,15042,15043,15044,15045,15046,15047,15048,15049,
+15050,15051,15052,15053,15054,15055,15056,15057,15058,15059,15060,15061,
+15062,15063,15064,15065,15066,15067,15068,15069,15070,15071,15072,15073,
+15074,15075,15076,15077,15078,15079,15080,15081,15082,15083,15084,15085,
+15086,15087,15088,15089,15090,15091,15092,15093,15094,15095,15096,15097,
+15098,15099,15100,15101,15102,15103,15104,15105,15106,15107,15108,15109,
+15110,15111,15112,15113,15114,15115,15116,15117,15118,15119,15120,15121,
+15122,15123,15124,15125,15126,15127,15128,15129,15130,15131,15132,15133,
+15134,15135,15136,15137,15138,15139,15140,15141,15142,15143,15144,15145,
+15146,15147,15148,15149,15150,15151,15152,15153,15154,15155,15156,15157,
+15158,15159,15160,15161,15162,15163,15164,15165,15166,15167,15168,15169,
+15170,15171,15172,15173,15174,15175,15176,15177,15178,15179,15180,15181,
+15182,15183,15184,15185,15186,15187,15188,15189,15190,15191,15192,15193,
+15194,15195,15196,15197,15198,15199,15200,15201,15202,15203,15204,15205,
+15206,15207,15208,15209,15210,15211,15212,15213,15214,15215,15216,15217,
+15218,15219,15220,15221,15222,15223,15224,15225,15226,15227,15228,15229,
+15230,15231,15232,15233,15234,15235,15236,15237,15238,15239,15240,15241,
+15242,15243,15244,15245,15246,15247,15248,15249,15250,15251,15252,15253,
+15254,15255,15256,15257,15258,15259,15260,15261,15262,15263,15264,15265,
+15266,15267,15268,15269,15270,15271,15272,15273,15274,15275,15276,15277,
+15278,15279,15280,15281,15282,15283,15284,15285,15286,15287,15288,15289,
+15290,15291,15292,15293,15294,15295,15296,15297,15298,15299,15300,15301,
+15302,15303,15304,15305,15306,15307,15308,15309,15310,15311,15312,15313,
+15314,15315,15316,15317,15318,15319,15320,15321,15322,15323,15324,15325,
+15326,15327,15328,15329,15330,15331,15332,15333,15334,15335,15336,15337,
+15338,15339,15340,15341,15342,15343,15344,15345,15346,15347,15348,15349,
+15350,15351,15352,15353,15354,15355,15356,15357,15358,15359,15360,15361,
+15362,15363,15364,15365,15366,15367,15368,15369,15370,15371,15372,15373,
+15374,15375,15376,15377,15378,15379,15380,15381,15382,15383,15384,15385,
+15386,15387,15388,15389,15390,15391,15392,15393,15394,15395,15396,15397,
+15398,15399,15400,15401,15402,15403,15404,15405,15406,15407,15408,15409,
+15410,15411,15412,15413,15414,15415,15416,15417,15418,15419,15420,15421,
+15422,15423,15424,15425,15426,15427,15428,15429,15430,15431,15432,15433,
+15434,15435,15436,15437,15438,15439,15440,15441,15442,15443,15444,15445,
+15446,15447,15448,15449,15450,15451,15452,15453,15454,15455,15456,15457,
+15458,15459,15460,15461,15462,15463,15464,15465,15466,15467,15468,15469,
+15470,15471,15472,15473,15474,15475,15476,15477,15478,15479,15480,15481,
+15482,15483,15484,15485,15486,15487,15488,15489,15490,15491,15492,15493,
+15494,15495,15496,15497,15498,15499,15500,15501,15502,15503,15504,15505,
+15506,15507,15508,15509,15510,15511,15512,15513,15514,15515,15516,15517,
+15518,15519,15520,15521,15522,15523,15524,15525,15526,15527,15528,15529,
+15530,15531,15532,15533,15534,15535,15536,15537,15538,15539,15540,15541,
+15542,15543,15544,15545,15546,15547,15548,15549,15550,15551,15552,15553,
+15554,15555,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,
+15566,15567,15568,15569,15570,15571,15572,15573,15574,15575,15576,15577,
+15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15589,
+15590,15591,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,
+15602,15603,15604,15605,15606,15607,15608,15609,15610,15611,15612,15613,
+15614,15615,15616,15617,15618,15619,15620,15621,15622,15623,15624,15625,
+15626,15627,15628,15629,15630,15631,15632,15633,15634,15635,15636,15637,
+15638,15639,15640,15641,15642,15643,15644,15645,15646,15647,15648,15649,
+15650,15651,15652,15653,15654,15655,15656,15657,15658,15659,15660,15661,
+15662,15663,15664,15665,15666,15667,15668,15669,15670,15671,15672,15673,
+15674,15675,15676,15677,15678,15679,15680,15681,15682,15683,15684,15685,
+15686,15687,15688,15689,15690,15691,15692,15693,15694,15695,15696,15697,
+15698,15699,15700,15701,15702,15703,15704,15705,15706,15707,15708,15709,
+15710,15711,15712,15713,15714,15715,15716,15717,15718,15719,15720,15721,
+15722,15723,15724,15725,15726,15727,15728,15729,15730,15731,15732,15733,
+15734,15735,15736,15737,15738,15739,15740,15741,15742,15743,15744,15745,
+15746,15747,15748,15749,15750,15751,15752,15753,15754,15755,15756,15757,
+15758,15759,15760,15761,15762,15763,15764,15765,15766,15767,15768,15769,
+15770,15771,15772,15773,15774,15775,15776,15777,15778,15779,15780,15781,
+15782,15783,15784,15785,15786,15787,15788,15789,15790,15791,15792,15793,
+15794,15795,15796,15797,15798,15799,15800,15801,15802,15803,15804,15805,
+15806,15807,15808,15809,15810,15811,15812,15813,15814,15815,15816,15817,
+15818,15819,15820,15821,15822,15823,15824,15825,15826,15827,15828,15829,
+15830,15831,15832,15833,15834,15835,15836,15837,15838,15839,15840,15841,
+15842,15843,15844,15845,15846,15847,15848,15849,15850,15851,15852,15853,
+15854,15855,15856,15857,15858,15859,15860,15861,15862,15863,15864,15865,
+15866,15867,15868,15869,15870,15871,15872,15873,15874,15875,15876,15877,
+15878,15879,15880,15881,15882,15883,15884,15885,15886,15887,15888,15889,
+15890,15891,15892,15893,15894,15895,15896,15897,15898,15899,15900,15901,
+15902,15903,15904,15905,15906,15907,15908,15909,15910,15911,15912,15913,
+15914,15915,15916,15917,15918,15919,15920,15921,15922,15923,15924,15925,
+15926,15927,15928,15929,15930,15931,15932,15933,15934,15935,15936,15937,
+15938,15939,15940,15941,15942,15943,15944,15945,15946,15947,15948,15949,
+15950,15951,15952,15953,15954,15955,15956,15957,15958,15959,15960,15961,
+15962,15963,15964,15965,15966,15967,15968,15969,15970,15971,15972,15973,
+15974,15975,15976,15977,15978,15979,15980,15981,15982,15983,15984,15985,
+15986,15987,15988,15989,15990,15991,15992,15993,15994,15995,15996,15997,
+15998,15999,16000,16001,16002,16003,16004,16005,16006,16007,16008,16009,
+16010,16011,16012,16013,16014,16015,16016,16017,16018,16019,16020,16021,
+16022,16023,16024,16025,16026,16027,16028,16029,16030,16031,16032,16033,
+16034,16035,16036,16037,16038,16039,16040,16041,16042,16043,16044,16045,
+16046,16047,16048,16049,16050,16051,16052,16053,16054,16055,16056,16057,
+16058,16059,16060,16061,16062,16063,16064,16065,16066,16067,16068,16069,
+16070,16071,16072,16073,16074,16075,16076,16077,16078,16079,16080,16081,
+16082,16083,16084,16085,16086,16087,16088,16089,16090,16091,16092,16093,
+16094,16095,16096,16097,16098,16099,16100,16101,16102,16103,16104,16105,
+16106,16107,16108,16109,16110,16111,16112,16113,16114,16115,16116,16117,
+16118,16119,16120,16121,16122,16123,16124,16125,16126,16127,16128,16129,
+16130,16131,16132,16133,16134,16135,16136,16137,16138,16139,16140,16141,
+16142,16143,16144,16145,16146,16147,16148,16149,16150,16151,16152,16153,
+16154,16155,16156,16157,16158,16159,16160,16161,16162,16163,16164,16165,
+16166,16167,16168,16169,16170,16171,16172,16173,16174,16175,16176,16177,
+16178,16179,16180,16181,16182,16183,16184,16185,16186,16187,16188,16189,
+16190,16191,16192,16193,16194,16195,16196,16197,16198,16199,16200,16201,
+16202,16203,16204,16205,16206,16207,16208,16209,16210,16211,16212,16213,
+16214,16215,16216,16217,16218,16219,16220,16221,16222,16223,16224,16225,
+16226,16227,16228,16229,16230,16231,16232,16233,16234,16235,16236,16237,
+16238,16239,16240,16241,16242,16243,16244,16245,16246,16247,16248,16249,
+16250,16251,16252,16253,16254,16255,16256,16257,16258,16259,16260,16261,
+16262,16263,16264,16265,16266,16267,16268,16269,16270,16271,16272,16273,
+16274,16275,16276,16277,16278,16279,16280,16281,16282,16283,16284,16285,
+16286,16287,16288,16289,16290,16291,16292,16293,16294,16295,16296,16297,
+16298,16299,16300,16301,16302,16303,16304,16305,16306,16307,16308,16309,
+16310,16311,16312,16313,16314,16315,16316,16317,16318,16319,16320,16321,
+16322,16323,16324,16325,16326,16327,16328,16329,16330,16331,16332,16333,
+16334,16335,16336,16337,16338,16339,16340,16341,16342,16343,16344,16345,
+16346,16347,16348,16349,16350,16351,16352,16353,16354,16355,16356,16357,
+16358,16359,16360,16361,16362,16363,16364,16365,16366,16367,16368,16369,
+16370,16371,16372,16373,16374,16375,16376,16377,16378,16379,16380,16381,
+16382,16383,16384,16385,16386,16387,16388,16389,16390,16391,16392,16393,
+16394,16395,16396,16397,16398,16399,16400,16401,16402,16403,16404,16405,
+16406,16407,16408,16409,16410,16411,16412,16413,16414,16415,16416,16417,
+16418,16419,16420,16421,16422,16423,16424,16425,16426,16427,16428,16429,
+16430,16431,16432,16433,16434,16435,16436,16437,16438,16439,16440,16441,
+16442,16443,16444,16445,16446,16447,16448,16449,16450,16451,16452,16453,
+16454,16455,16456,16457,16458,16459,16460,16461,16462,16463,16464,16465,
+16466,16467,16468,16469,16470,16471,16472,16473,16474,16475,16476,16477,
+16478,16479,16480,16481,16482,16483,16484,16485,16486,16487,16488,16489,
+16490,16491,16492,16493,16494,16495,16496,16497,16498,16499,16500,16501,
+16502,16503,16504,16505,16506,16507,16508,16509,16510,16511,16512,16513,
+16514,16515,16516,16517,16518,16519,16520,16521,16522,16523,16524,16525,
+16526,16527,16528,16529,16530,16531,16532,16533,16534,16535,16536,16537,
+16538,16539,16540,16541,16542,16543,16544,16545,16546,16547,16548,16549,
+16550,16551,16552,16553,16554,16555,16556,16557,16558,16559,16560,16561,
+16562,16563,16564,16565,16566,16567,16568,16569,16570,16571,16572,16573,
+16574,16575,16576,16577,16578,16579,16580,16581,16582,16583,16584,16585,
+16586,16587,16588,16589,16590,16591,16592,16593,16594,16595,16596,16597,
+16598,16599,16600,16601,16602,16603,16604,16605,16606,16607,16608,16609,
+16610,16611,16612,16613,16614,16615,16616,16617,16618,16619,16620,16621,
+16622,16623,16624,16625,16626,16627,16628,16629,16630,16631,16632,16633,
+16634,16635,16636,16637,16638,16639,16640,16641,16642,16643,16644,16645,
+16646,16647,16648,16649,16650,16651,16652,16653,16654,16655,16656,16657,
+16658,16659,16660,16661,16662,16663,16664,16665,16666,16667,16668,16669,
+16670,16671,16672,16673,16674,16675,16676,16677,16678,16679,16680,16681,
+16682,16683,16684,16685,16686,16687,16688,16689,16690,16691,16692,16693,
+16694,16695,16696,16697,16698,16699,16700,16701,16702,16703,16704,16705,
+16706,16707,16708,16709,16710,16711,16712,16713,16714,16715,16716,16717,
+16718,16719,16720,16721,16722,16723,16724,16725,16726,16727,16728,16729,
+16730,16731,16732,16733,16734,16735,16736,16737,16738,16739,16740,16741,
+16742,16743,16744,16745,16746,16747,16748,16749,16750,16751,16752,16753,
+16754,16755,16756,16757,16758,16759,16760,16761,16762,16763,16764,16765,
+16766,16767,16768,16769,16770,16771,16772,16773,16774,16775,16776,16777,
+16778,16779,16780,16781,16782,16783,16784,16785,16786,16787,16788,16789,
+16790,16791,16792,16793,16794,16795,16796,16797,16798,16799,16800,16801,
+16802,16803,16804,16805,16806,16807,16808,16809,16810,16811,16812,16813,
+16814,16815,16816,16817,16818,16819,16820,16821,16822,16823,16824,16825,
+16826,16827,16828,16829,16830,16831,16832,16833,16834,16835,16836,16837,
+16838,16839,16840,16841,16842,16843,16844,16845,16846,16847,16848,16849,
+16850,16851,16852,16853,16854,16855,16856,16857,16858,16859,16860,16861,
+16862,16863,16864,16865,16866,16867,16868,16869,16870,16871,16872,16873,
+16874,16875,16876,16877,16878,16879,16880,16881,16882,16883,16884,16885,
+16886,16887,16888,16889,16890,16891,16892,16893,16894,16895,16896,16897,
+16898,16899,16900,16901,16902,16903,16904,16905,16906,16907,16908,16909,
+16910,16911,16912,16913,16914,16915,16916,16917,16918,16919,16920,16921,
+16922,16923,16924,16925,16926,16927,16928,16929,16930,16931,16932,16933,
+16934,16935,16936,16937,16938,16939,16940,16941,16942,16943,16944,16945,
+16946,16947,16948,16949,16950,16951,16952,16953,16954,16955,16956,16957,
+16958,16959,16960,16961,16962,16963,16964,16965,16966,16967,16968,16969,
+16970,16971,16972,16973,16974,16975,16976,16977,16978,16979,16980,16981,
+16982,16983,16984,16985,16986,16987,16988,16989,16990,16991,16992,16993,
+16994,16995,16996,16997,16998,16999,17000,17001,17002,17003,17004,17005,
+17006,17007,17008,17009,17010,17011,17012,17013,17014,17015,17016,17017,
+17018,17019,17020,17021,17022,17023,17024,17025,17026,17027,17028,17029,
+17030,17031,17032,17033,17034,17035,17036,17037,17038,17039,17040,17041,
+17042,17043,17044,17045,17046,17047,17048,17049,17050,17051,17052,17053,
+17054,17055,17056,17057,17058,17059,17060,17061,17062,17063,17064,17065,
+17066,17067,17068,17069,17070,17071,17072,17073,17074,17075,17076,17077,
+17078,17079,17080,17081,17082,17083,17084,17085,17086,17087,17088,17089,
+17090,17091,17092,17093,17094,17095,17096,17097,17098,17099,17100,17101,
+17102,17103,17104,17105,17106,17107,17108,17109,17110,17111,17112,17113,
+17114,17115,17116,17117,17118,17119,17120,17121,17122,17123,17124,17125,
+17126,17127,17128,17129,17130,17131,17132,17133,17134,17135,17136,17137,
+17138,17139,17140,17141,17142,17143,17144,17145,17146,17147,17148,17149,
+17150,17151,17152,17153,17154,17155,17156,17157,17158,17159,17160,17161,
+17162,17163,17164,17165,17166,17167,17168,17169,17170,17171,17172,17173,
+17174,17175,17176,17177,17178,17179,17180,17181,17182,17183,17184,17185,
+17186,17187,17188,17189,17190,17191,17192,17193,17194,17195,17196,17197,
+17198,17199,17200,17201,17202,17203,17204,17205,17206,17207,17208,17209,
+17210,17211,17212,17213,17214,17215,17216,17217,17218,17219,17220,17221,
+17222,17223,17224,17225,17226,17227,17228,17229,17230,17231,17232,17233,
+17234,17235,17236,17237,17238,17239,17240,17241,17242,17243,17244,17245,
+17246,17247,17248,17249,17250,17251,17252,17253,17254,17255,17256,17257,
+17258,17259,17260,17261,17262,17263,17264,17265,17266,17267,17268,17269,
+17270,17271,17272,17273,17274,17275,17276,17277,17278,17279,17280,17281,
+17282,17283,17284,17285,17286,17287,17288,17289,17290,17291,17292,17293,
+17294,17295,17296,17297,17298,17299,17300,17301,17302,17303,17304,17305,
+17306,17307,17308,17309,17310,17311,17312,17313,17314,17315,17316,17317,
+17318,17319,17320,17321,17322,17323,17324,17325,17326,17327,17328,17329,
+17330,17331,17332,17333,17334,17335,17336,17337,17338,17339,17340,17341,
+17342,17343,17344,17345,17346,17347,17348,17349,17350,17351,17352,17353,
+17354,17355,17356,17357,17358,17359,17360,17361,17362,17363,17364,17365,
+17366,17367,17368,17369,17370,17371,17372,17373,17374,17375,17376,17377,
+17378,17379,17380,17381,17382,17383,17384,17385,17386,17387,17388,17389,
+17390,17391,17392,17393,17394,17395,17396,17397,17398,17399,17400,17401,
+17402,17403,17404,17405,17406,17407,17408,17409,17410,17411,17412,17413,
+17414,17415,17416,17417,17418,17419,17420,17421,17422,17423,17424,17425,
+17426,17427,17428,17429,17430,17431,17432,17433,17434,17435,17436,17437,
+17438,17439,17440,17441,17442,17443,17444,17445,17446,17447,17448,17449,
+17450,17451,17452,17453,17454,17455,17456,17457,17458,17459,17460,17461,
+17462,17463,17464,17465,17466,17467,17468,17469,17470,17471,17472,17473,
+17474,17475,17476,17477,17478,17479,17480,17481,17482,17483,17484,17485,
+17486,17487,17488,17489,17490,17491,17492,17493,17494,17495,17496,17497,
+17498,17499,17500,17501,17502,17503,17504,17505,17506,17507,17508,17509,
+17510,17511,17512,17513,17514,17515,17516,17517,17518,17519,17520,17521,
+17522,17523,17524,17525,17526,17527,17528,17529,17530,17531,17532,17533,
+17534,17535,17536,17537,17538,17539,17540,17541,17542,17543,17544,17545,
+17546,17547,17548,17549,17550,17551,17552,17553,17554,17555,17556,17557,
+17558,17559,17560,17561,17562,17563,17564,17565,17566,17567,17568,17569,
+17570,17571,17572,17573,17574,17575,17576,17577,17578,17579,17580,17581,
+17582,17583,17584,17585,17586,17587,17588,17589,17590,17591,17592,17593,
+17594,17595,17596,17597,17598,17599,17600,17601,17602,17603,17604,17605,
+17606,17607,17608,17609,17610,17611,17612,17613,17614,17615,17616,17617,
+17618,17619,17620,17621,17622,17623,17624,17625,17626,17627,17628,17629,
+17630,17631,17632,17633,17634,17635,17636,17637,17638,17639,17640,17641,
+17642,17643,17644,17645,17646,17647,17648,17649,17650,17651,17652,17653,
+17654,17655,17656,17657,17658,17659,17660,17661,17662,17663,17664,17665,
+17666,17667,17668,17669,17670,17671,17672,17673,17674,17675,17676,17677,
+17678,17679,17680,17681,17682,17683,17684,17685,17686,17687,17688,17689,
+17690,17691,17692,17693,17694,17695,17696,17697,17698,17699,17700,17701,
+17702,17703,17704,17705,17706,17707,17708,17709,17710,17711,17712,17713,
+17714,17715,17716,17717,17718,17719,17720,17721,17722,17723,17724,17725,
+17726,17727,17728,17729,17730,17731,17732,17733,17734,17735,17736,17737,
+17738,17739,17740,17741,17742,17743,17744,17745,17746,17747,17748,17749,
+17750,17751,17752,17753,17754,17755,17756,17757,17758,17759,17760,17761,
+17762,17763,17764,17765,17766,17767,17768,17769,17770,17771,17772,17773,
+17774,17775,17776,17777,17778,17779,17780,17781,17782,17783,17784,17785,
+17786,17787,17788,17789,17790,17791,17792,17793,17794,17795,17796,17797,
+17798,17799,17800,17801,17802,17803,17804,17805,17806,17807,17808,17809,
+17810,17811,17812,17813,17814,17815,17816,17817,17818,17819,17820,17821,
+17822,17823,17824,17825,17826,17827,17828,17829,17830,17831,17832,17833,
+17834,17835,17836,17837,17838,17839,17840,17841,17842,17843,17844,17845,
+17846,17847,17848,17849,17850,17851,17852,17853,17854,17855,17856,17857,
+17858,17859,17860,17861,17862,17863,17864,17865,17866,17867,17868,17869,
+17870,17871,17872,17873,17874,17875,17876,17877,17878,17879,17880,17881,
+17882,17883,17884,17885,17886,17887,17888,17889,17890,17891,17892,17893,
+17894,17895,17896,17897,17898,17899,17900,17901,17902,17903,17904,17905,
+17906,17907,17908,17909,17910,17911,17912,17913,17914,17915,17916,17917,
+17918,17919,17920,17921,17922,17923,17924,17925,17926,17927,17928,17929,
+17930,17931,17932,17933,17934,17935,17936,17937,17938,17939,17940,17941,
+17942,17943,17944,17945,17946,17947,17948,17949,17950,17951,17952,17953,
+17954,17955,17956,17957,17958,17959,17960,17961,17962,17963,17964,17965,
+17966,17967,17968,17969,17970,17971,17972,17973,17974,17975,17976,17977,
+17978,17979,17980,17981,17982,17983,17984,17985,17986,17987,17988,17989,
+17990,17991,17992,17993,17994,17995,17996,17997,17998,17999,18000,18001,
+18002,18003,18004,18005,18006,18007,18008,18009,18010,18011,18012,18013,
+18014,18015,18016,18017,18018,18019,18020,18021,18022,18023,18024,18025,
+18026,18027,18028,18029,18030,18031,18032,18033,18034,18035,18036,18037,
+18038,18039,18040,18041,18042,18043,18044,18045,18046,18047,18048,18049,
+18050,18051,18052,18053,18054,18055,18056,18057,18058,18059,18060,18061,
+18062,18063,18064,18065,18066,18067,18068,18069,18070,18071,18072,18073,
+18074,18075,18076,18077,18078,18079,18080,18081,18082,18083,18084,18085,
+18086,18087,18088,18089,18090,18091,18092,18093,18094,18095,18096,18097,
+18098,18099,18100,18101,18102,18103,18104,18105,18106,18107,18108,18109,
+18110,18111,18112,18113,18114,18115,18116,18117,18118,18119,18120,18121,
+18122,18123,18124,18125,18126,18127,18128,18129,18130,18131,18132,18133,
+18134,18135,18136,18137,18138,18139,18140,18141,18142,18143,18144,18145,
+18146,18147,18148,18149,18150,18151,18152,18153,18154,18155,18156,18157,
+18158,18159,18160,18161,18162,18163,18164,18165,18166,18167,18168,18169,
+18170,18171,18172,18173,18174,18175,18176,18177,18178,18179,18180,18181,
+18182,18183,18184,18185,18186,18187,18188,18189,18190,18191,18192,18193,
+18194,18195,18196,18197,18198,18199,18200,18201,18202,18203,18204,18205,
+18206,18207,18208,18209,18210,18211,18212,18213,18214,18215,18216,18217,
+18218,18219,18220,18221,18222,18223,18224,18225,18226,18227,18228,18229,
+18230,18231,18232,18233,18234,18235,18236,18237,18238,18239,18240,18241,
+18242,18243,18244,18245,18246,18247,18248,18249,18250,18251,18252,18253,
+18254,18255,18256,18257,18258,18259,18260,18261,18262,18263,18264,18265,
+18266,18267,18268,18269,18270,18271,18272,18273,18274,18275,18276,18277,
+18278,18279,18280,18281,18282,18283,18284,18285,18286,18287,18288,18289,
+18290,18291,18292,18293,18294,18295,18296,18297,18298,18299,18300,18301,
+18302,18303,18304,18305,18306,18307,18308,18309,18310,18311,18312,18313,
+18314,18315,18316,18317,18318,18319,18320,18321,18322,18323,18324,18325,
+18326,18327,18328,18329,18330,18331,18332,18333,18334,18335,18336,18337,
+18338,18339,18340,18341,18342,18343,18344,18345,18346,18347,18348,18349,
+18350,18351,18352,18353,18354,18355,18356,18357,18358,18359,18360,18361,
+18362,18363,18364,18365,18366,18367,18368,18369,18370,18371,18372,18373,
+18374,18375,18376,18377,18378,18379,18380,18381,18382,18383,18384,18385,
+18386,18387,18388,18389,18390,18391,18392,18393,18394,18395,18396,18397,
+18398,18399,18400,18401,18402,18403,18404,18405,18406,18407,18408,18409,
+18410,18411,18412,18413,18414,18415,18416,18417,18418,18419,18420,18421,
+18422,18423,18424,18425,18426,18427,18428,18429,18430,18431,18432,18433,
+18434,18435,18436,18437,18438,18439,18440,18441,18442,18443,18444,18445,
+18446,18447,18448,18449,18450,18451,18452,18453,18454,18455,18456,18457,
+18458,18459,18460,18461,18462,18463,18464,18465,18466,18467,18468,18469,
+18470,18471,18472,18473,18474,18475,18476,18477,18478,18479,18480,18481,
+18482,18483,18484,18485,18486,18487,18488,18489,18490,18491,18492,18493,
+18494,18495,18496,18497,18498,18499,18500,18501,18502,18503,18504,18505,
+18506,18507,18508,18509,18510,18511,18512,18513,18514,18515,18516,18517,
+18518,18519,18520,18521,18522,18523,18524,18525,18526,18527,18528,18529,
+18530,18531,18532,18533,18534,18535,18536,18537,18538,18539,18540,18541,
+18542,18543,18544,18545,18546,18547,18548,18549,18550,18551,18552,18553,
+18554,18555,18556,18557,18558,18559,18560,18561,18562,18563,18564,18565,
+18566,18567,18568,18569,18570,18571,18572,18573,18574,18575,18576,18577,
+18578,18579,18580,18581,18582,18583,18584,18585,18586,18587,18588,18589,
+18590,18591,18592,18593,18594,18595,18596,18597,18598,18599,18600,18601,
+18602,18603,18604,18605,18606,18607,18608,18609,18610,18611,18612,18613,
+18614,18615,18616,18617,18618,18619,18620,18621,18622,18623,18624,18625,
+18626,18627,18628,18629,18630,18631,18632,18633,18634,18635,18636,18637,
+18638,18639,18640,18641,18642,18643,18644,18645,18646,18647,18648,18649,
+18650,18651,18652,18653,18654,18655,18656,18657,18658,18659,18660,18661,
+18662,18663,18664,18665,18666,18667,18668,18669,18670,18671,18672,18673,
+18674,18675,18676,18677,18678,18679,18680,18681,18682,18683,18684,18685,
+18686,18687,18688,18689,18690,18691,18692,18693,18694,18695,18696,18697,
+18698,18699,18700,18701,18702,18703,18704,18705,18706,18707,18708,18709,
+18710,18711,18712,18713,18714,18715,18716,18717,18718,18719,18720,18721,
+18722,18723,18724,18725,18726,18727,18728,18729,18730,18731,18732,18733,
+18734,18735,18736,18737,18738,18739,18740,18741,18742,18743,18744,18745,
+18746,18747,18748,18749,18750,18751,18752,18753,18754,18755,18756,18757,
+18758,18759,18760,18761,18762,18763,18764,18765,18766,18767,18768,18769,
+18770,18771,18772,18773,18774,18775,18776,18777,18778,18779,18780,18781,
+18782,18783,18784,18785,18786,18787,18788,18789,18790,18791,18792,18793,
+18794,18795,18796,18797,18798,18799,18800,18801,18802,18803,18804,18805,
+18806,18807,18808,18809,18810,18811,18812,18813,18814,18815,18816,18817,
+18818,18819,18820,18821,18822,18823,18824,18825,18826,18827,18828,18829,
+18830,18831,18832,18833,18834,18835,18836,18837,18838,18839,18840,18841,
+18842,18843,18844,18845,18846,18847,18848,18849,18850,18851,18852,18853,
+18854,18855,18856,18857,18858,18859,18860,18861,18862,18863,18864,18865,
+18866,18867,18868,18869,18870,18871,18872,18873,18874,18875,18876,18877,
+18878,18879,18880,18881,18882,18883,18884,18885,18886,18887,18888,18889,
+18890,18891,18892,18893,18894,18895,18896,18897,18898,18899,18900,18901,
+18902,18903,18904,18905,18906,18907,18908,18909,18910,18911,18912,18913,
+18914,18915,18916,18917,18918,18919,18920,18921,18922,18923,18924,18925,
+18926,18927,18928,18929,18930,18931,18932,18933,18934,18935,18936,18937,
+18938,18939,18940,18941,18942,18943,18944,18945,18946,18947,18948,18949,
+18950,18951,18952,18953,18954,18955,18956,18957,18958,18959,18960,18961,
+18962,18963,18964,18965,18966,18967,18968,18969,18970,18971,18972,18973,
+18974,18975,18976,18977,18978,18979,18980,18981,18982,18983,18984,18985,
+18986,18987,18988,18989,18990,18991,18992,18993,18994,18995,18996,18997,
+18998,18999,19000,19001,19002,19003,19004,19005,19006,19007,19008,19009,
+19010,19011,19012,19013,19014,19015,19016,19017,19018,19019,19020,19021,
+19022,19023,19024,19025,19026,19027,19028,19029,19030,19031,19032,19033,
+19034,19035,19036,19037,19038,19039,19040,19041,19042,19043,19044,19045,
+19046,19047,19048,19049,19050,19051,19052,19053,19054,19055,19056,19057,
+19058,19059,19060,19061,19062,19063,19064,19065,19066,19067,19068,19069,
+19070,19071,19072,19073,19074,19075,19076,19077,19078,19079,19080,19081,
+19082,19083,19084,19085,19086,19087,19088,19089,19090,19091,19092,19093,
+19094,19095,19096,19097,19098,19099,19100,19101,19102,19103,19104,19105,
+19106,19107,19108,19109,19110,19111,19112,19113,19114,19115,19116,19117,
+19118,19119,19120,19121,19122,19123,19124,19125,19126,19127,19128,19129,
+19130,19131,19132,19133,19134,19135,19136,19137,19138,19139,19140,19141,
+19142,19143,19144,19145,19146,19147,19148,19149,19150,19151,19152,19153,
+19154,19155,19156,19157,19158,19159,19160,19161,19162,19163,19164,19165,
+19166,19167,19168,19169,19170,19171,19172,19173,19174,19175,19176,19177,
+19178,19179,19180,19181,19182,19183,19184,19185,19186,19187,19188,19189,
+19190,19191,19192,19193,19194,19195,19196,19197,19198,19199,19200,19201,
+19202,19203,19204,19205,19206,19207,19208,19209,19210,19211,19212,19213,
+19214,19215,19216,19217,19218,19219,19220,19221,19222,19223,19224,19225,
+19226,19227,19228,19229,19230,19231,19232,19233,19234,19235,19236,19237,
+19238,19239,19240,19241,19242,19243,19244,19245,19246,19247,19248,19249,
+19250,19251,19252,19253,19254,19255,19256,19257,19258,19259,19260,19261,
+19262,19263,19264,19265,19266,19267,19268,19269,19270,19271,19272,19273,
+19274,19275,19276,19277,19278,19279,19280,19281,19282,19283,19284,19285,
+19286,19287,19288,19289,19290,19291,19292,19293,19294,19295,19296,19297,
+19298,19299,19300,19301,19302,19303,19304,19305,19306,19307,19308,19309,
+19310,19311,19312,19313,19314,19315,19316,19317,19318,19319,19320,19321,
+19322,19323,19324,19325,19326,19327,19328,19329,19330,19331,19332,19333,
+19334,19335,19336,19337,19338,19339,19340,19341,19342,19343,19344,19345,
+19346,19347,19348,19349,19350,19351,19352,19353,19354,19355,19356,19357,
+19358,19359,19360,19361,19362,19363,19364,19365,19366,19367,19368,19369,
+19370,19371,19372,19373,19374,19375,19376,19377,19378,19379,19380,19381,
+19382,19383,19384,19385,19386,19387,19388,19389,19390,19391,19392,19393,
+19394,19395,19396,19397,19398,19399,19400,19401,19402,19403,19404,19405,
+19406,19407,19408,19409,19410,19411,19412,19413,19414,19415,19416,19417,
+19418,19419,19420,19421,19422,19423,19424,19425,19426,19427,19428,19429,
+19430,19431,19432,19433,19434,19435,19436,19437,19438,19439,19440,19441,
+19442,19443,19444,19445,19446,19447,19448,19449,19450,19451,19452,19453,
+19454,19455,19456,19457,19458,19459,19460,19461,19462,19463,19464,19465,
+19466,19467,19468,19469,19470,19471,19472,19473,19474,19475,19476,19477,
+19478,19479,19480,19481,19482,19483,19484,19485,19486,19487,19488,19489,
+19490,19491,19492,19493,19494,19495,19496,19497,19498,19499,19500,19501,
+19502,19503,19504,19505,19506,19507,19508,19509,19510,19511,19512,19513,
+19514,19515,19516,19517,19518,19519,19520,19521,19522,19523,19524,19525,
+19526,19527,19528,19529,19530,19531,19532,19533,19534,19535,19536,19537,
+19538,19539,19540,19541,19542,19543,19544,19545,19546,19547,19548,19549,
+19550,19551,19552,19553,19554,19555,19556,19557,19558,19559,19560,19561,
+19562,19563,19564,19565,19566,19567,19568,19569,19570,19571,19572,19573,
+19574,19575,19576,19577,19578,19579,19580,19581,19582,19583,19584,19585,
+19586,19587,19588,19589,19590,19591,19592,19593,19594,19595,19596,19597,
+19598,19599,19600,19601,19602,19603,19604,19605,19606,19607,19608,19609,
+19610,19611,19612,19613,19614,19615,19616,19617,19618,19619,19620,19621,
+19622,19623,19624,19625,19626,19627,19628,19629,19630,19631,19632,19633,
+19634,19635,19636,19637,19638,19639,19640,19641,19642,19643,19644,19645,
+19646,19647,19648,19649,19650,19651,19652,19653,19654,19655,19656,19657,
+19658,19659,19660,19661,19662,19663,19664,19665,19666,19667,19668,19669,
+19670,19671,19672,19673,19674,19675,19676,19677,19678,19679,19680,19681,
+19682,19683,19684,19685,19686,19687,19688,19689,19690,19691,19692,19693,
+19694,19695,19696,19697,19698,19699,19700,19701,19702,19703,19704,19705,
+19706,19707,19708,19709,19710,19711,19712,19713,19714,19715,19716,19717,
+19718,19719,19720,19721,19722,19723,19724,19725,19726,19727,19728,19729,
+19730,19731,19732,19733,19734,19735,19736,19737,19738,19739,19740,19741,
+19742,19743,19744,19745,19746,19747,19748,19749,19750,19751,19752,19753,
+19754,19755,19756,19757,19758,19759,19760,19761,19762,19763,19764,19765,
+19766,19767,19768,19769,19770,19771,19772,19773,19774,19775,19776,19777,
+19778,19779,19780,19781,19782,19783,19784,19785,19786,19787,19788,19789,
+19790,19791,19792,19793,19794,19795,19796,19797,19798,19799,19800,19801,
+19802,19803,19804,19805,19806,19807,19808,19809,19810,19811,19812,19813,
+19814,19815,19816,19817,19818,19819,19820,19821,19822,19823,19824,19825,
+19826,19827,19828,19829,19830,19831,19832,19833,19834,19835,19836,19837,
+19838,19839,19840,19841,19842,19843,19844,19845,19846,19847,19848,19849,
+19850,19851,19852,19853,19854,19855,19856,19857,19858,19859,19860,19861,
+19862,19863,19864,19865,19866,19867,19868,19869,19870,19871,19872,19873,
+19874,19875,19876,19877,19878,19879,19880,19881,19882,19883,19884,19885,
+19886,19887,19888,19889,19890,19891,19892,19893,19894,19895,19896,19897,
+19898,19899,19900,19901,19902,19903,19904,19905,19906,19907,19908,19909,
+19910,19911,19912,19913,19914,19915,19916,19917,19918,19919,19920,19921,
+19922,19923,19924,19925,19926,19927,19928,19929,19930,19931,19932,19933,
+19934,19935,19936,19937,19938,19939,19940,19941,19942,19943,19944,19945,
+19946,19947,19948,19949,19950,19951,19952,19953,19954,19955,19956,19957,
+19958,19959,19960,19961,19962,19963,19964,19965,19966,19967,19968,19969,
+19970,19971,19972,19973,19974,19975,19976,19977,19978,19979,19980,19981,
+19982,19983,19984,19985,19986,19987,19988,19989,19990,19991,19992,19993,
+19994,19995,19996,19997,19998,19999,20000,20001,20002,20003,20004,20005,
+20006,20007,20008,20009,20010,20011,20012,20013,20014,20015,20016,20017,
+20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,
+20030,20031,20032,20033,20034,20035,20036,20037,20038,20039,20040,20041,
+20042,20043,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,
+20054,20055,20056,20057,20058,20059,20060,20061,20062,20063,20064,20065,
+20066,20067,20068,20069,20070,20071,20072,20073,20074,20075,20076,20077,
+20078,20079,20080,20081,20082,20083,20084,20085,20086,20087,20088,20089,
+20090,20091,20092,20093,20094,20095,20096,20097,20098,20099,20100,20101,
+20102,20103,20104,20105,20106,20107,20108,20109,20110,20111,20112,20113,
+20114,20115,20116,20117,20118,20119,20120,20121,20122,20123,20124,20125,
+20126,20127,20128,20129,20130,20131,20132,20133,20134,20135,20136,20137,
+20138,20139,20140,20141,20142,20143,20144,20145,20146,20147,20148,20149,
+20150,20151,20152,20153,20154,20155,20156,20157,20158,20159,20160,20161,
+20162,20163,20164,20165,20166,20167,20168,20169,20170,20171,20172,20173,
+20174,20175,20176,20177,20178,20179,20180,20181,20182,20183,20184,20185,
+20186,20187,20188,20189,20190,20191,20192,20193,20194,20195,20196,20197,
+20198,20199,20200,20201,20202,20203,20204,20205,20206,20207,20208,20209,
+20210,20211,20212,20213,20214,20215,20216,20217,20218,20219,20220,20221,
+20222,20223,20224,20225,20226,20227,20228,20229,20230,20231,20232,20233,
+20234,20235,20236,20237,20238,20239,20240,20241,20242,20243,20244,20245,
+20246,20247,20248,20249,20250,20251,20252,20253,20254,20255,20256,20257,
+20258,20259,20260,20261,20262,20263,20264,20265,20266,20267,20268,20269,
+20270,20271,20272,20273,20274,20275,20276,20277,20278,20279,20280,20281,
+20282,20283,20284,20285,20286,20287,20288,20289,20290,20291,20292,20293,
+20294,20295,20296,20297,20298,20299,20300,20301,20302,20303,20304,20305,
+20306,20307,20308,20309,20310,20311,20312,20313,20314,20315,20316,20317,
+20318,20319,20320,20321,20322,20323,20324,20325,20326,20327,20328,20329,
+20330,20331,20332,20333,20334,20335,20336,20337,20338,20339,20340,20341,
+20342,20343,20344,20345,20346,20347,20348,20349,20350,20351,20352,20353,
+20354,20355,20356,20357,20358,20359,20360,20361,20362,20363,20364,20365,
+20366,20367,20368,20369,20370,20371,20372,20373,20374,20375,20376,20377,
+20378,20379,20380,20381,20382,20383,20384,20385,20386,20387,20388,20389,
+20390,20391,20392,20393,20394,20395,20396,20397,20398,20399,20400,20401,
+20402,20403,20404,20405,20406,20407,20408,20409,20410,20411,20412,20413,
+20414,20415,20416,20417,20418,20419,20420,20421,20422,20423,20424,20425,
+20426,20427,20428,20429,20430,20431,20432,20433,20434,20435,20436,20437,
+20438,20439,20440,20441,20442,20443,20444,20445,20446,20447,20448,20449,
+20450,20451,20452,20453,20454,20455,20456,20457,20458,20459,20460,20461,
+20462,20463,20464,20465,20466,20467,20468,20469,20470,20471,20472,20473,
+20474,20475,20476,20477,20478,20479,20480,20481,20482,20483,20484,20485,
+20486,20487,20488,20489,20490,20491,20492,20493,20494,20495,20496,20497,
+20498,20499,20500,20501,20502,20503,20504,20505,20506,20507,20508,20509,
+20510,20511,20512,20513,20514,20515,20516,20517,20518,20519,20520,20521,
+20522,20523,20524,20525,20526,20527,20528,20529,20530,20531,20532,20533,
+20534,20535,20536,20537,20538,20539,20540,20541,20542,20543,20544,20545,
+20546,20547,20548,20549,20550,20551,20552,20553,20554,20555,20556,20557,
+20558,20559,20560,20561,20562,20563,20564,20565,20566,20567,20568,20569,
+20570,20571,20572,20573,20574,20575,20576,20577,20578,20579,20580,20581,
+20582,20583,20584,20585,20586,20587,20588,20589,20590,20591,20592,20593,
+20594,20595,20596,20597,20598,20599,20600,20601,20602,20603,20604,20605,
+20606,20607,20608,20609,20610,20611,20612,20613,20614,20615,20616,20617,
+20618,20619,20620,20621,20622,20623,20624,20625,20626,20627,20628,20629,
+20630,20631,20632,20633,20634,20635,20636,20637,20638,20639,20640,20641,
+20642,20643,20644,20645,20646,20647,20648,20649,20650,20651,20652,20653,
+20654,20655,20656,20657,20658,20659,20660,20661,20662,20663,20664,20665,
+20666,20667,20668,20669,20670,20671,20672,20673,20674,20675,20676,20677,
+20678,20679,20680,20681,20682,20683,20684,20685,20686,20687,20688,20689,
+20690,20691,20692,20693,20694,20695,20696,20697,20698,20699,20700,20701,
+20702,20703,20704,20705,20706,20707,20708,20709,20710,20711,20712,20713,
+20714,20715,20716,20717,20718,20719,20720,20721,20722,20723,20724,20725,
+20726,20727,20728,20729,20730,20731,20732,20733,20734,20735,20736,20737,
+20738,20739,20740,20741,20742,20743,20744,20745,20746,20747,20748,20749,
+20750,20751,20752,20753,20754,20755,20756,20757,20758,20759,20760,20761,
+20762,20763,20764,20765,20766,20767,20768,20769,20770,20771,20772,20773,
+20774,20775,20776,20777,20778,20779,20780,20781,20782,20783,20784,20785,
+20786,20787,20788,20789,20790,20791,20792,20793,20794,20795,20796,20797,
+20798,20799,20800,20801,20802,20803,20804,20805,20806,20807,20808,20809,
+20810,20811,20812,20813,20814,20815,20816,20817,20818,20819,20820,20821,
+20822,20823,20824,20825,20826,20827,20828,20829,20830,20831,20832,20833,
+20834,20835,20836,20837,20838,20839,20840,20841,20842,20843,20844,20845,
+20846,20847,20848,20849,20850,20851,20852,20853,20854,20855,20856,20857,
+20858,20859,20860,20861,20862,20863,20864,20865,20866,20867,20868,20869,
+20870,20871,20872,20873,20874,20875,20876,20877,20878,20879,20880,20881,
+20882,20883,20884,20885,20886,20887,20888,20889,20890,20891,20892,20893,
+20894,20895,20896,20897,20898,20899,20900,20901,20902,20903,20904,20905,
+20906,20907,20908,20909,20910,20911,20912,20913,20914,20915,20916,20917,
+20918,20919,20920,20921,20922,20923,20924,20925,20926,20927,20928,20929,
+20930,20931,20932,20933,20934,20935,20936,20937,20938,20939,20940,20941,
+20942,20943,20944,20945,20946,20947,20948,20949,20950,20951,20952,20953,
+20954,20955,20956,20957,20958,20959,20960,20961,20962,20963,20964,20965,
+20966,20967,20968,20969,20970,20971,20972,20973,20974,20975,20976,20977,
+20978,20979,20980,20981,20982,20983,20984,20985,20986,20987,20988,20989,
+20990,20991,20992,20993,20994,20995,20996,20997,20998,20999,21000,21001,
+21002,21003,21004,21005,21006,21007,21008,21009,21010,21011,21012,21013,
+21014,21015,21016,21017,21018,21019,21020,21021,21022,21023,21024,21025,
+21026,21027,21028,21029,21030,21031,21032,21033,21034,21035,21036,21037,
+21038,21039,21040,21041,21042,21043,21044,21045,21046,21047,21048,21049,
+21050,21051,21052,21053,21054,21055,21056,21057,21058,21059,21060,21061,
+21062,21063,21064,21065,21066,21067,21068,21069,21070,21071,21072,21073,
+21074,21075,21076,21077,21078,21079,21080,21081,21082,21083,21084,21085,
+21086,21087,21088,21089,21090,21091,21092,21093,21094,21095,21096,21097,
+21098,21099,21100,21101,21102,21103,21104,21105,21106,21107,21108,21109,
+21110,21111,21112,21113,21114,21115,21116,21117,21118,21119,21120,21121,
+21122,21123,21124,21125,21126,21127,21128,21129,21130,21131,21132,21133,
+21134,21135,21136,21137,21138,21139,21140,21141,21142,21143,21144,21145,
+21146,21147,21148,21149,21150,21151,21152,21153,21154,21155,21156,21157,
+21158,21159,21160,21161,21162,21163,21164,21165,21166,21167,21168,21169,
+21170,21171,21172,21173,21174,21175,21176,21177,21178,21179,21180,21181,
+21182,21183,21184,21185,21186,21187,21188,21189,21190,21191,21192,21193,
+21194,21195,21196,21197,21198,21199,21200,21201,21202,21203,21204,21205,
+21206,21207,21208,21209,21210,21211,21212,21213,21214,21215,21216,21217,
+21218,21219,21220,21221,21222,21223,21224,21225,21226,21227,21228,21229,
+21230,21231,21232,21233,21234,21235,21236,21237,21238,21239,21240,21241,
+21242,21243,21244,21245,21246,21247,21248,21249,21250,21251,21252,21253,
+21254,21255,21256,21257,21258,21259,21260,21261,21262,21263,21264,21265,
+21266,21267,21268,21269,21270,21271,21272,21273,21274,21275,21276,21277,
+21278,21279,21280,21281,21282,21283,21284,21285,21286,21287,21288,21289,
+21290,21291,21292,21293,21294,21295,21296,21297,21298,21299,21300,21301,
+21302,21303,21304,21305,21306,21307,21308,21309,21310,21311,21312,21313,
+21314,21315,21316,21317,21318,21319,21320,21321,21322,21323,21324,21325,
+21326,21327,21328,21329,21330,21331,21332,21333,21334,21335,21336,21337,
+21338,21339,21340,21341,21342,21343,21344,21345,21346,21347,21348,21349,
+21350,21351,21352,21353,21354,21355,21356,21357,21358,21359,21360,21361,
+21362,21363,21364,21365,21366,21367,21368,21369,21370,21371,21372,21373,
+21374,21375,21376,21377,21378,21379,21380,21381,21382,21383,21384,21385,
+21386,21387,21388,21389,21390,21391,21392,21393,21394,21395,21396,21397,
+21398,21399,21400,21401,21402,21403,21404,21405,21406,21407,21408,21409,
+21410,21411,21412,21413,21414,21415,21416,21417,21418,21419,21420,21421,
+21422,21423,21424,21425,21426,21427,21428,21429,21430,21431,21432,21433,
+21434,21435,21436,21437,21438,21439,21440,21441,21442,21443,21444,21445,
+21446,21447,21448,21449,21450,21451,21452,21453,21454,21455,21456,21457,
+21458,21459,21460,21461,21462,21463,21464,21465,21466,21467,21468,21469,
+21470,21471,21472,21473,21474,21475,21476,21477,21478,21479,21480,21481,
+21482,21483,21484,21485,21486,21487,21488,21489,21490,21491,21492,21493,
+21494,21495,21496,21497,21498,21499,21500,21501,21502,21503,21504,21505,
+21506,21507,21508,21509,21510,21511,21512,21513,21514,21515,21516,21517,
+21518,21519,21520,21521,21522,21523,21524,21525,21526,21527,21528,21529,
+21530,21531,21532,21533,21534,21535,21536,21537,21538,21539,21540,21541,
+21542,21543,21544,21545,21546,21547,21548,21549,21550,21551,21552,21553,
+21554,21555,21556,21557,21558,21559,21560,21561,21562,21563,21564,21565,
+21566,21567,21568,21569,21570,21571,21572,21573,21574,21575,21576,21577,
+21578,21579,21580,21581,21582,21583,21584,21585,21586,21587,21588,21589,
+21590,21591,21592,21593,21594,21595,21596,21597,21598,21599,21600,21601,
+21602,21603,21604,21605,21606,21607,21608,21609,21610,21611,21612,21613,
+21614,21615,21616,21617,21618,21619,21620,21621,21622,21623,21624,21625,
+21626,21627,21628,21629,21630,21631,21632,21633,21634,21635,21636,21637,
+21638,21639,21640,21641,21642,21643,21644,21645,21646,21647,21648,21649,
+21650,21651,21652,21653,21654,21655,21656,21657,21658,21659,21660,21661,
+21662,21663,21664,21665,21666,21667,21668,21669,21670,21671,21672,21673,
+21674,21675,21676,21677,21678,21679,21680,21681,21682,21683,21684,21685,
+21686,21687,21688,21689,21690,21691,21692,21693,21694,21695,21696,21697,
+21698,21699,21700,21701,21702,21703,21704,21705,21706,21707,21708,21709,
+21710,21711,21712,21713,21714,21715,21716,21717,21718,21719,21720,21721,
+21722,21723,21724,21725,21726,21727,21728,21729,21730,21731,21732,21733,
+21734,21735,21736,21737,21738,21739,21740,21741,21742,21743,21744,21745,
+21746,21747,21748,21749,21750,21751,21752,21753,21754,21755,21756,21757,
+21758,21759,21760,21761,21762,21763,21764,21765,21766,21767,21768,21769,
+21770,21771,21772,21773,21774,21775,21776,21777,21778,21779,21780,21781,
+21782,21783,21784,21785,21786,21787,21788,21789,21790,21791,21792,21793,
+21794,21795,21796,21797,21798,21799,21800,21801,21802,21803,21804,21805,
+21806,21807,21808,21809,21810,21811,21812,21813,21814,21815,21816,21817,
+21818,21819,21820,21821,21822,21823,21824,21825,21826,21827,21828,21829,
+21830,21831,21832,21833,21834,21835,21836,21837,21838,21839,21840,21841,
+21842,21843,21844,21845,21846,21847,21848,21849,21850,21851,21852,21853,
+21854,21855,21856,21857,21858,21859,21860,21861,21862,21863,21864,21865,
+21866,21867,21868,21869,21870,21871,21872,21873,21874,21875,21876,21877,
+21878,21879,21880,21881,21882,21883,21884,21885,21886,21887,21888,21889,
+21890,21891,21892,21893,21894,21895,21896,21897,21898,21899,21900,21901,
+21902,21903,21904,21905,21906,21907,21908,21909,21910,21911,21912,21913,
+21914,21915,21916,21917,21918,21919,21920,21921,21922,21923,21924,21925,
+21926,21927,21928,21929,21930,21931,21932,21933,21934,21935,21936,21937,
+21938,21939,21940,21941,21942,21943,21944,21945,21946,21947,21948,21949,
+21950,21951,21952,21953,21954,21955,21956,21957,21958,21959,21960,21961,
+21962,21963,21964,21965,21966,21967,21968,21969,21970,21971,21972,21973,
+21974,21975,21976,21977,21978,21979,21980,21981,21982,21983,21984,21985,
+21986,21987,21988,21989,21990,21991,21992,21993,21994,21995,21996,21997,
+21998,21999,22000,22001,22002,22003,22004,22005,22006,22007,22008,22009,
+22010,22011,22012,22013,22014,22015,22016,22017,22018,22019,22020,22021,
+22022,22023,22024,22025,22026,22027,22028,22029,22030,22031,22032,22033,
+22034,22035,22036,22037,22038,22039,22040,22041,22042,22043,22044,22045,
+22046,22047,22048,22049,22050,22051,22052,22053,22054,22055,22056,22057,
+22058,22059,22060,22061,22062,22063,22064,22065,22066,22067,22068,22069,
+22070,22071,22072,22073,22074,22075,22076,22077,22078,22079,22080,22081,
+22082,22083,22084,22085,22086,22087,22088,22089,22090,22091,22092,22093,
+22094,22095,22096,22097,22098,22099,22100,22101,22102,22103,22104,22105,
+22106,22107,22108,22109,22110,22111,22112,22113,22114,22115,22116,22117,
+22118,22119,22120,22121,22122,22123,22124,22125,22126,22127,22128,22129,
+22130,22131,22132,22133,22134,22135,22136,22137,22138,22139,22140,22141,
+22142,22143,22144,22145,22146,22147,22148,22149,22150,22151,22152,22153,
+22154,22155,22156,22157,22158,22159,22160,22161,22162,22163,22164,22165,
+22166,22167,22168,22169,22170,22171,22172,22173,22174,22175,22176,22177,
+22178,22179,22180,22181,22182,22183,22184,22185,22186,22187,22188,22189,
+22190,22191,22192,22193,22194,22195,22196,22197,22198,22199,22200,22201,
+22202,22203,22204,22205,22206,22207,22208,22209,22210,22211,22212,22213,
+22214,22215,22216,22217,22218,22219,22220,22221,22222,22223,22224,22225,
+22226,22227,22228,22229,22230,22231,22232,22233,22234,22235,22236,22237,
+22238,22239,22240,22241,22242,22243,22244,22245,22246,22247,22248,22249,
+22250,22251,22252,22253,22254,22255,22256,22257,22258,22259,22260,22261,
+22262,22263,22264,22265,22266,22267,22268,22269,22270,22271,22272,22273,
+22274,22275,22276,22277,22278,22279,22280,22281,22282,22283,22284,22285,
+22286,22287,22288,22289,22290,22291,22292,22293,22294,22295,22296,22297,
+22298,22299,22300,22301,22302,22303,22304,22305,22306,22307,22308,22309,
+22310,22311,22312,22313,22314,22315,22316,22317,22318,22319,22320,22321,
+22322,22323,22324,22325,22326,22327,22328,22329,22330,22331,22332,22333,
+22334,22335,22336,22337,22338,22339,22340,22341,22342,22343,22344,22345,
+22346,22347,22348,22349,22350,22351,22352,22353,22354,22355,22356,22357,
+22358,22359,22360,22361,22362,22363,22364,22365,22366,22367,22368,22369,
+22370,22371,22372,22373,22374,22375,22376,22377,22378,22379,22380,22381,
+22382,22383,22384,22385,22386,22387,22388,22389,22390,22391,22392,22393,
+22394,22395,22396,22397,22398,22399,22400,22401,22402,22403,22404,22405,
+22406,22407,22408,22409,22410,22411,22412,22413,22414,22415,22416,22417,
+22418,22419,22420,22421,22422,22423,22424,22425,22426,22427,22428,22429,
+22430,22431,22432,22433,22434,22435,22436,22437,22438,22439,22440,22441,
+22442,22443,22444,22445,22446,22447,22448,22449,22450,22451,22452,22453,
+22454,22455,22456,22457,22458,22459,22460,22461,22462,22463,22464,22465,
+22466,22467,22468,22469,22470,22471,22472,22473,22474,22475,22476,22477,
+22478,22479,22480,22481,22482,22483,22484,22485,22486,22487,22488,22489,
+22490,22491,22492,22493,22494,22495,22496,22497,22498,22499,22500,22501,
+22502,22503,22504,22505,22506,22507,22508,22509,22510,22511,22512,22513,
+22514,22515,22516,22517,22518,22519,22520,22521,22522,22523,22524,22525,
+22526,22527,22528,22529,22530,22531,22532,22533,22534,22535,22536,22537,
+22538,22539,22540,22541,22542,22543,22544,22545,22546,22547,22548,22549,
+22550,22551,22552,22553,22554,22555,22556,22557,22558,22559,22560,22561,
+22562,22563,22564,22565,22566,22567,22568,22569,22570,22571,22572,22573,
+22574,22575,22576,22577,22578,22579,22580,22581,22582,22583,22584,22585,
+22586,22587,22588,22589,22590,22591,22592,22593,22594,22595,22596,22597,
+22598,22599,22600,22601,22602,22603,22604,22605,22606,22607,22608,22609,
+22610,22611,22612,22613,22614,22615,22616,22617,22618,22619,22620,22621,
+22622,22623,22624,22625,22626,22627,22628,22629,22630,22631,22632,22633,
+22634,22635,22636,22637,22638,22639,22640,22641,22642,22643,22644,22645,
+22646,22647,22648,22649,22650,22651,22652,22653,22654,22655,22656,22657,
+22658,22659,22660,22661,22662,22663,22664,22665,22666,22667,22668,22669,
+22670,22671,22672,22673,22674,22675,22676,22677,22678,22679,22680,22681,
+22682,22683,22684,22685,22686,22687,22688,22689,22690,22691,22692,22693,
+22694,22695,22696,22697,22698,22699,22700,22701,22702,22703,22704,22705,
+22706,22707,22708,22709,22710,22711,22712,22713,22714,22715,22716,22717,
+22718,22719,22720,22721,22722,22723,22724,22725,22726,22727,22728,22729,
+22730,22731,22732,22733,22734,22735,22736,22737,22738,22739,22740,22741,
+22742,22743,22744,22745,22746,22747,22748,22749,22750,22751,22752,22753,
+22754,22755,22756,22757,22758,22759,22760,22761,22762,22763,22764,22765,
+22766,22767,22768,22769,22770,22771,22772,22773,22774,22775,22776,22777,
+22778,22779,22780,22781,22782,22783,22784,22785,22786,22787,22788,22789,
+22790,22791,22792,22793,22794,22795,22796,22797,22798,22799,22800,22801,
+22802,22803,22804,22805,22806,22807,22808,22809,22810,22811,22812,22813,
+22814,22815,22816,22817,22818,22819,22820,22821,22822,22823,22824,22825,
+22826,22827,22828,22829,22830,22831,22832,22833,22834,22835,22836,22837,
+22838,22839,22840,22841,22842,22843,22844,22845,22846,22847,22848,22849,
+22850,22851,22852,22853,22854,22855,22856,22857,22858,22859,22860,22861,
+22862,22863,22864,22865,22866,22867,22868,22869,22870,22871,22872,22873,
+22874,22875,22876,22877,22878,22879,22880,22881,22882,22883,22884,22885,
+22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,22896,22897,
+22898,22899,22900,22901,22902,22903,22904,22905,22906,22907,22908,22909,
+22910,22911,22912,22913,22914,22915,22916,22917,22918,22919,22920,22921,
+22922,22923,22924,22925,22926,22927,22928,22929,22930,22931,22932,22933,
+22934,22935,22936,22937,22938,22939,22940,22941,22942,22943,22944,22945,
+22946,22947,22948,22949,22950,22951,22952,22953,22954,22955,22956,22957,
+22958,22959,22960,22961,22962,22963,22964,22965,22966,22967,22968,22969,
+22970,22971,22972,22973,22974,22975,22976,22977,22978,22979,22980,22981,
+22982,22983,22984,22985,22986,22987,22988,22989,22990,22991,22992,22993,
+22994,22995,22996,22997,22998,22999,23000,23001,23002,23003,23004,23005,
+23006,23007,23008,23009,23010,23011,23012,23013,23014,23015,23016,23017,
+23018,23019,23020,23021,23022,23023,23024,23025,23026,23027,23028,23029,
+23030,23031,23032,23033,23034,23035,23036,23037,23038,23039,23040,23041,
+23042,23043,23044,23045,23046,23047,23048,23049,23050,23051,23052,23053,
+23054,23055,23056,23057,23058,23059,23060,23061,23062,23063,23064,23065,
+23066,23067,23068,23069,23070,23071,23072,23073,23074,23075,23076,23077,
+23078,23079,23080,23081,23082,23083,23084,23085,23086,23087,23088,23089,
+23090,23091,23092,23093,23094,23095,23096,23097,23098,23099,23100,23101,
+23102,23103,23104,23105,23106,23107,23108,23109,23110,23111,23112,23113,
+23114,23115,23116,23117,23118,23119,23120,23121,23122,23123,23124,23125,
+23126,23127,23128,23129,23130,23131,23132,23133,23134,23135,23136,23137,
+23138,23139,23140,23141,23142,23143,23144,23145,23146,23147,23148,23149,
+23150,23151,23152,23153,23154,23155,23156,23157,23158,23159,23160,23161,
+23162,23163,23164,23165,23166,23167,23168,23169,23170,23171,23172,23173,
+23174,23175,23176,23177,23178,23179,23180,23181,23182,23183,23184,23185,
+23186,23187,23188,23189,23190,23191,23192,23193,23194,23195,23196,23197,
+23198,23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,23209,
+23210,23211,23212,23213,23214,23215,23216,23217,23218,23219,23220,23221,
+23222,23223,23224,23225,23226,23227,23228,23229,23230,23231,23232,23233,
+23234,23235,23236,23237,23238,23239,23240,23241,23242,23243,23244,23245,
+23246,23247,23248,23249,23250,23251,23252,23253,23254,23255,23256,23257,
+23258,23259,23260,23261,23262,23263,23264,23265,23266,23267,23268,23269,
+23270,23271,23272,23273,23274,23275,23276,23277,23278,23279,23280,23281,
+23282,23283,23284,23285,23286,23287,23288,23289,23290,23291,23292,23293,
+23294,23295,23296,23297,23298,23299,23300,23301,23302,23303,23304,23305,
+23306,23307,23308,23309,23310,23311,23312,23313,23314,23315,23316,23317,
+23318,23319,23320,23321,23322,23323,23324,23325,23326,23327,23328,23329,
+23330,23331,23332,23333,23334,23335,23336,23337,23338,23339,23340,23341,
+23342,23343,23344,23345,23346,23347,23348,23349,23350,23351,23352,23353,
+23354,23355,23356,23357,23358,23359,23360,23361,23362,23363,23364,23365,
+23366,23367,23368,23369,23370,23371,23372,23373,23374,23375,23376,23377,
+23378,23379,23380,23381,23382,23383,23384,23385,23386,23387,23388,23389,
+23390,23391,23392,23393,23394,23395,23396,23397,23398,23399,23400,23401,
+23402,23403,23404,23405,23406,23407,23408,23409,23410,23411,23412,23413,
+23414,23415,23416,23417,23418,23419,23420,23421,23422,23423,23424,23425,
+23426,23427,23428,23429,23430,23431,23432,23433,23434,23435,23436,23437,
+23438,23439,23440,23441,23442,23443,23444,23445,23446,23447,23448,23449,
+23450,23451,23452,23453,23454,23455,23456,23457,23458,23459,23460,23461,
+23462,23463,23464,23465,23466,23467,23468,23469,23470,23471,23472,23473,
+23474,23475,23476,23477,23478,23479,23480,23481,23482,23483,23484,23485,
+23486,23487,23488,23489,23490,23491,23492,23493,23494,23495,23496,23497,
+23498,23499,23500,23501,23502,23503,23504,23505,23506,23507,23508,23509,
+23510,23511,23512,23513,23514,23515,23516,23517,23518,23519,23520,23521,
+23522,23523,23524,23525,23526,23527,23528,23529,23530,23531,23532,23533,
+23534,23535,23536,23537,23538,23539,23540,23541,23542,23543,23544,23545,
+23546,23547,23548,23549,23550,23551,23552,23553,23554,23555,23556,23557,
+23558,23559,23560,23561,23562,23563,23564,23565,23566,23567,23568,23569,
+23570,23571,23572,23573,23574,23575,23576,23577,23578,23579,23580,23581,
+23582,23583,23584,23585,23586,23587,23588,23589,23590,23591,23592,23593,
+23594,23595,23596,23597,23598,23599,23600,23601,23602,23603,23604,23605,
+23606,23607,23608,23609,23610,23611,23612,23613,23614,23615,23616,23617,
+23618,23619,23620,23621,23622,23623,23624,23625,23626,23627,23628,23629,
+23630,23631,23632,23633,23634,23635,23636,23637,23638,23639,23640,23641,
+23642,23643,23644,23645,23646,23647,23648,23649,23650,23651,23652,23653,
+23654,23655,23656,23657,23658,23659,23660,23661,23662,23663,23664,23665,
+23666,23667,23668,23669,23670,23671,23672,23673,23674,23675,23676,23677,
+23678,23679,23680,23681,23682,23683,23684,23685,23686,23687,23688,23689,
+23690,23691,23692,23693,23694,23695,23696,23697,23698,23699,23700,23701,
+23702,23703,23704,23705,23706,23707,23708,23709,23710,23711,23712,23713,
+23714,23715,23716,23717,23718,23719,23720,23721,23722,23723,23724,23725,
+23726,23727,23728,23729,23730,23731,23732,23733,23734,23735,23736,23737,
+23738,23739,23740,23741,23742,23743,23744,23745,23746,23747,23748,23749,
+23750,23751,23752,23753,23754,23755,23756,23757,23758,23759,23760,23761,
+23762,23763,23764,23765,23766,23767,23768,23769,23770,23771,23772,23773,
+23774,23775,23776,23777,23778,23779,23780,23781,23782,23783,23784,23785,
+23786,23787,23788,23789,23790,23791,23792,23793,23794,23795,23796,23797,
+23798,23799,23800,23801,23802,23803,23804,23805,23806,23807,23808,23809,
+23810,23811,23812,23813,23814,23815,23816,23817,23818,23819,23820,23821,
+23822,23823,23824,23825,23826,23827,23828,23829,23830,23831,23832,23833,
+23834,23835,23836,23837,23838,23839,23840,23841,23842,23843,23844,23845,
+23846,23847,23848,23849,23850,23851,23852,23853,23854,23855,23856,23857,
+23858,23859,23860,23861,23862,23863,23864,23865,23866,23867,23868,23869,
+23870,23871,23872,23873,23874,23875,23876,23877,23878,23879,23880,23881,
+23882,23883,23884,23885,23886,23887,23888,23889,23890,23891,23892,23893,
+23894,23895,23896,23897,23898,23899,23900,23901,23902,23903,23904,23905,
+23906,23907,23908,23909,23910,23911,23912,23913,23914,23915,23916,23917,
+23918,23919,23920,23921,23922,23923,23924,23925,23926,23927,23928,23929,
+23930,23931,23932,23933,23934,23935,23936,23937,23938,23939,23940,23941,
+23942,23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,
+23954,23955,23956,23957,23958,23959,23960,23961,23962,23963,23964,23965,
+23966,23967,23968,23969,23970,23971,23972,23973,23974,23975,23976,23977,
+23978,23979,23980,23981,23982,23983,23984,23985,23986,23987,23988,23989,
+23990,23991,23992,23993,23994,23995,23996,23997,23998,23999,24000,24001,
+24002,24003,24004,24005,24006,24007,24008,24009,24010,24011,24012,24013,
+24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,24024,24025,
+24026,24027,24028,24029,24030,24031,24032,24033,24034,24035,24036,24037,
+24038,24039,24040,24041,24042,24043,24044,24045,24046,24047,24048,24049,
+24050,24051,24052,24053,24054,24055,24056,24057,24058,24059,24060,24061,
+24062,24063,24064,24065,24066,24067,24068,24069,24070,24071,24072,24073,
+24074,24075,24076,24077,24078,24079,24080,24081,24082,24083,24084,24085,
+24086,24087,24088,24089,24090,24091,24092,24093,24094,24095,24096,24097,
+24098,24099,24100,24101,24102,24103,24104,24105,24106,24107,24108,24109,
+24110,24111,24112,24113,24114,24115,24116,24117,24118,24119,24120,24121,
+24122,24123,24124,24125,24126,24127,24128,24129,24130,24131,24132,24133,
+24134,24135,24136,24137,24138,24139,24140,24141,24142,24143,24144,24145,
+24146,24147,24148,24149,24150,24151,24152,24153,24154,24155,24156,24157,
+24158,24159,24160,24161,24162,24163,24164,24165,24166,24167,24168,24169,
+24170,24171,24172,24173,24174,24175,24176,24177,24178,24179,24180,24181,
+24182,24183,24184,24185,24186,24187,24188,24189,24190,24191,24192,24193,
+24194,24195,24196,24197,24198,24199,24200,24201,24202,24203,24204,24205,
+24206,24207,24208,24209,24210,24211,24212,24213,24214,24215,24216,24217,
+24218,24219,24220,24221,24222,24223,24224,24225,24226,24227,24228,24229,
+24230,24231,24232,24233,24234,24235,24236,24237,24238,24239,24240,24241,
+24242,24243,24244,24245,24246,24247,24248,24249,24250,24251,24252,24253,
+24254,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,24265,
+24266,24267,24268,24269,24270,24271,24272,24273,24274,24275,24276,24277,
+24278,24279,24280,24281,24282,24283,24284,24285,24286,24287,24288,24289,
+24290,24291,24292,24293,24294,24295,24296,24297,24298,24299,24300,24301,
+24302,24303,24304,24305,24306,24307,24308,24309,24310,24311,24312,24313,
+24314,24315,24316,24317,24318,24319,24320,24321,24322,24323,24324,24325,
+24326,24327,24328,24329,24330,24331,24332,24333,24334,24335,24336,24337,
+24338,24339,24340,24341,24342,24343,24344,24345,24346,24347,24348,24349,
+24350,24351,24352,24353,24354,24355,24356,24357,24358,24359,24360,24361,
+24362,24363,24364,24365,24366,24367,24368,24369,24370,24371,24372,24373,
+24374,24375,24376,24377,24378,24379,24380,24381,24382,24383,24384,24385,
+24386,24387,24388,24389,24390,24391,24392,24393,24394,24395,24396,24397,
+24398,24399,24400,24401,24402,24403,24404,24405,24406,24407,24408,24409,
+24410,24411,24412,24413,24414,24415,24416,24417,24418,24419,24420,24421,
+24422,24423,24424,24425,24426,24427,24428,24429,24430,24431,24432,24433,
+24434,24435,24436,24437,24438,24439,24440,24441,24442,24443,24444,24445,
+24446,24447,24448,24449,24450,24451,24452,24453,24454,24455,24456,24457,
+24458,24459,24460,24461,24462,24463,24464,24465,24466,24467,24468,24469,
+24470,24471,24472,24473,24474,24475,24476,24477,24478,24479,24480,24481,
+24482,24483,24484,24485,24486,24487,24488,24489,24490,24491,24492,24493,
+24494,24495,24496,24497,24498,24499,24500,24501,24502,24503,24504,24505,
+24506,24507,24508,24509,24510,24511,24512,24513,24514,24515,24516,24517,
+24518,24519,24520,24521,24522,24523,24524,24525,24526,24527,24528,24529,
+24530,24531,24532,24533,24534,24535,24536,24537,24538,24539,24540,24541,
+24542,24543,24544,24545,24546,24547,24548,24549,24550,24551,24552,24553,
+24554,24555,24556,24557,24558,24559,24560,24561,24562,24563,24564,24565,
+24566,24567,24568,24569,24570,24571,24572,24573,24574,24575,24576,24577,
+24578,24579,24580,24581,24582,24583,24584,24585,24586,24587,24588,24589,
+24590,24591,24592,24593,24594,24595,24596,24597,24598,24599,24600,24601,
+24602,24603,24604,24605,24606,24607,24608,24609,24610,24611,24612,24613,
+24614,24615,24616,24617,24618,24619,24620,24621,24622,24623,24624,24625,
+24626,24627,24628,24629,24630,24631,24632,24633,24634,24635,24636,24637,
+24638,24639,24640,24641,24642,24643,24644,24645,24646,24647,24648,24649,
+24650,24651,24652,24653,24654,24655,24656,24657,24658,24659,24660,24661,
+24662,24663,24664,24665,24666,24667,24668,24669,24670,24671,24672,24673,
+24674,24675,24676,24677,24678,24679,24680,24681,24682,24683,24684,24685,
+24686,24687,24688,24689,24690,24691,24692,24693,24694,24695,24696,24697,
+24698,24699,24700,24701,24702,24703,24704,24705,24706,24707,24708,24709,
+24710,24711,24712,24713,24714,24715,24716,24717,24718,24719,24720,24721,
+24722,24723,24724,24725,24726,24727,24728,24729,24730,24731,24732,24733,
+24734,24735,24736,24737,24738,24739,24740,24741,24742,24743,24744,24745,
+24746,24747,24748,24749,24750,24751,24752,24753,24754,24755,24756,24757,
+24758,24759,24760,24761,24762,24763,24764,24765,24766,24767,24768,24769,
+24770,24771,24772,24773,24774,24775,24776,24777,24778,24779,24780,24781,
+24782,24783,24784,24785,24786,24787,24788,24789,24790,24791,24792,24793,
+24794,24795,24796,24797,24798,24799,24800,24801,24802,24803,24804,24805,
+24806,24807,24808,24809,24810,24811,24812,24813,24814,24815,24816,24817,
+24818,24819,24820,24821,24822,24823,24824,24825,24826,24827,24828,24829,
+24830,24831,24832,24833,24834,24835,24836,24837,24838,24839,24840,24841,
+24842,24843,24844,24845,24846,24847,24848,24849,24850,24851,24852,24853,
+24854,24855,24856,24857,24858,24859,24860,24861,24862,24863,24864,24865,
+24866,24867,24868,24869,24870,24871,24872,24873,24874,24875,24876,24877,
+24878,24879,24880,24881,24882,24883,24884,24885,24886,24887,24888,24889,
+24890,24891,24892,24893,24894,24895,24896,24897,24898,24899,24900,24901,
+24902,24903,24904,24905,24906,24907,24908,24909,24910,24911,24912,24913,
+24914,24915,24916,24917,24918,24919,24920,24921,24922,24923,24924,24925,
+24926,24927,24928,24929,24930,24931,24932,24933,24934,24935,24936,24937,
+24938,24939,24940,24941,24942,24943,24944,24945,24946,24947,24948,24949,
+24950,24951,24952,24953,24954,24955,24956,24957,24958,24959,24960,24961,
+24962,24963,24964,24965,24966,24967,24968,24969,24970,24971,24972,24973,
+24974,24975,24976,24977,24978,24979,24980,24981,24982,24983,24984,24985,
+24986,24987,24988,24989,24990,24991,24992,24993,24994,24995,24996,24997,
+24998,24999,25000,25001,25002,25003,25004,25005,25006,25007,25008,25009,
+25010,25011,25012,25013,25014,25015,25016,25017,25018,25019,25020,25021,
+25022,25023,25024,25025,25026,25027,25028,25029,25030,25031,25032,25033,
+25034,25035,25036,25037,25038,25039,25040,25041,25042,25043,25044,25045,
+25046,25047,25048,25049,25050,25051,25052,25053,25054,25055,25056,25057,
+25058,25059,25060,25061,25062,25063,25064,25065,25066,25067,25068,25069,
+25070,25071,25072,25073,25074,25075,25076,25077,25078,25079,25080,25081,
+25082,25083,25084,25085,25086,25087,25088,25089,25090,25091,25092,25093,
+25094,25095,25096,25097,25098,25099,25100,25101,25102,25103,25104,25105,
+25106,25107,25108,25109,25110,25111,25112,25113,25114,25115,25116,25117,
+25118,25119,25120,25121,25122,25123,25124,25125,25126,25127,25128,25129,
+25130,25131,25132,25133,25134,25135,25136,25137,25138,25139,25140,25141,
+25142,25143,25144,25145,25146,25147,25148,25149,25150,25151,25152,25153,
+25154,25155,25156,25157,25158,25159,25160,25161,25162,25163,25164,25165,
+25166,25167,25168,25169,25170,25171,25172,25173,25174,25175,25176,25177,
+25178,25179,25180,25181,25182,25183,25184,25185,25186,25187,25188,25189,
+25190,25191,25192,25193,25194,25195,25196,25197,25198,25199,25200,25201,
+25202,25203,25204,25205,25206,25207,25208,25209,25210,25211,25212,25213,
+25214,25215,25216,25217,25218,25219,25220,25221,25222,25223,25224,25225,
+25226,25227,25228,25229,25230,25231,25232,25233,25234,25235,25236,25237,
+25238,25239,25240,25241,25242,25243,25244,25245,25246,25247,25248,25249,
+25250,25251,25252,25253,25254,25255,25256,25257,25258,25259,25260,25261,
+25262,25263,25264,25265,25266,25267,25268,25269,25270,25271,25272,25273,
+25274,25275,25276,25277,25278,25279,25280,25281,25282,25283,25284,25285,
+25286,25287,25288,25289,25290,25291,25292,25293,25294,25295,25296,25297,
+25298,25299,25300,25301,25302,25303,25304,25305,25306,25307,25308,25309,
+25310,25311,25312,25313,25314,25315,25316,25317,25318,25319,25320,25321,
+25322,25323,25324,25325,25326,25327,25328,25329,25330,25331,25332,25333,
+25334,25335,25336,25337,25338,25339,25340,25341,25342,25343,25344,25345,
+25346,25347,25348,25349,25350,25351,25352,25353,25354,25355,25356,25357,
+25358,25359,25360,25361,25362,25363,25364,25365,25366,25367,25368,25369,
+25370,25371,25372,25373,25374,25375,25376,25377,25378,25379,25380,25381,
+25382,25383,25384,25385,25386,25387,25388,25389,25390,25391,25392,25393,
+25394,25395,25396,25397,25398,25399,25400,25401,25402,25403,25404,25405,
+25406,25407,25408,25409,25410,25411,25412,25413,25414,25415,25416,25417,
+25418,25419,25420,25421,25422,25423,25424,25425,25426,25427,25428,25429,
+25430,25431,25432,25433,25434,25435,25436,25437,25438,25439,25440,25441,
+25442,25443,25444,25445,25446,25447,25448,25449,25450,25451,25452,25453,
+25454,25455,25456,25457,25458,25459,25460,25461,25462,25463,25464,25465,
+25466,25467,25468,25469,25470,25471,25472,25473,25474,25475,25476,25477,
+25478,25479,25480,25481,25482,25483,25484,25485,25486,25487,25488,25489,
+25490,25491,25492,25493,25494,25495,25496,25497,25498,25499,25500,25501,
+25502,25503,25504,25505,25506,25507,25508,25509,25510,25511,25512,25513,
+25514,25515,25516,25517,25518,25519,25520,25521,25522,25523,25524,25525,
+25526,25527,25528,25529,25530,25531,25532,25533,25534,25535,25536,25537,
+25538,25539,25540,25541,25542,25543,25544,25545,25546,25547,25548,25549,
+25550,25551,25552,25553,25554,25555,25556,25557,25558,25559,25560,25561,
+25562,25563,25564,25565,25566,25567,25568,25569,25570,25571,25572,25573,
+25574,25575,25576,25577,25578,25579,25580,25581,25582,25583,25584,25585,
+25586,25587,25588,25589,25590,25591,25592,25593,25594,25595,25596,25597,
+25598,25599,25600,25601,25602,25603,25604,25605,25606,25607,25608,25609,
+25610,25611,25612,25613,25614,25615,25616,25617,25618,25619,25620,25621,
+25622,25623,25624,25625,25626,25627,25628,25629,25630,25631,25632,25633,
+25634,25635,25636,25637,25638,25639,25640,25641,25642,25643,25644,25645,
+25646,25647,25648,25649,25650,25651,25652,25653,25654,25655,25656,25657,
+25658,25659,25660,25661,25662,25663,25664,25665,25666,25667,25668,25669,
+25670,25671,25672,25673,25674,25675,25676,25677,25678,25679,25680,25681,
+25682,25683,25684,25685,25686,25687,25688,25689,25690,25691,25692,25693,
+25694,25695,25696,25697,25698,25699,25700,25701,25702,25703,25704,25705,
+25706,25707,25708,25709,25710,25711,25712,25713,25714,25715,25716,25717,
+25718,25719,25720,25721,25722,25723,25724,25725,25726,25727,25728,25729,
+25730,25731,25732,25733,25734,25735,25736,25737,25738,25739,25740,25741,
+25742,25743,25744,25745,25746,25747,25748,25749,25750,25751,25752,25753,
+25754,25755,25756,25757,25758,25759,25760,25761,25762,25763,25764,25765,
+25766,25767,25768,25769,25770,25771,25772,25773,25774,25775,25776,25777,
+25778,25779,25780,25781,25782,25783,25784,25785,25786,25787,25788,25789,
+25790,25791,25792,25793,25794,25795,25796,25797,25798,25799,25800,25801,
+25802,25803,25804,25805,25806,25807,25808,25809,25810,25811,25812,25813,
+25814,25815,25816,25817,25818,25819,25820,25821,25822,25823,25824,25825,
+25826,25827,25828,25829,25830,25831,25832,25833,25834,25835,25836,25837,
+25838,25839,25840,25841,25842,25843,25844,25845,25846,25847,25848,25849,
+25850,25851,25852,25853,25854,25855,25856,25857,25858,25859,25860,25861,
+25862,25863,25864,25865,25866,25867,25868,25869,25870,25871,25872,25873,
+25874,25875,25876,25877,25878,25879,25880,25881,25882,25883,25884,25885,
+25886,25887,25888,25889,25890,25891,25892,25893,25894,25895,25896,25897,
+25898,25899,25900,25901,25902,25903,25904,25905,25906,25907,25908,25909,
+25910,25911,25912,25913,25914,25915,25916,25917,25918,25919,25920,25921,
+25922,25923,25924,25925,25926,25927,25928,25929,25930,25931,25932,25933,
+25934,25935,25936,25937,25938,25939,25940,25941,25942,25943,25944,25945,
+25946,25947,25948,25949,25950,25951,25952,25953,25954,25955,25956,25957,
+25958,25959,25960,25961,25962,25963,25964,25965,25966,25967,25968,25969,
+25970,25971,25972,25973,25974,25975,25976,25977,25978,25979,25980,25981,
+25982,25983,25984,25985,25986,25987,25988,25989,25990,25991,25992,25993,
+25994,25995,25996,25997,25998,25999,26000,26001,26002,26003,26004,26005,
+26006,26007,26008,26009,26010,26011,26012,26013,26014,26015,26016,26017,
+26018,26019,26020,26021,26022,26023,26024,26025,26026,26027,26028,26029,
+26030,26031,26032,26033,26034,26035,26036,26037,26038,26039,26040,26041,
+26042,26043,26044,26045,26046,26047,26048,26049,26050,26051,26052,26053,
+26054,26055,26056,26057,26058,26059,26060,26061,26062,26063,26064,26065,
+26066,26067,26068,26069,26070,26071,26072,26073,26074,26075,26076,26077,
+26078,26079,26080,26081,26082,26083,26084,26085,26086,26087,26088,26089,
+26090,26091,26092,26093,26094,26095,26096,26097,26098,26099,26100,26101,
+26102,26103,26104,26105,26106,26107,26108,26109,26110,26111,26112,26113,
+26114,26115,26116,26117,26118,26119,26120,26121,26122,26123,26124,26125,
+26126,26127,26128,26129,26130,26131,26132,26133,26134,26135,26136,26137,
+26138,26139,26140,26141,26142,26143,26144,26145,26146,26147,26148,26149,
+26150,26151,26152,26153,26154,26155,26156,26157,26158,26159,26160,26161,
+26162,26163,26164,26165,26166,26167,26168,26169,26170,26171,26172,26173,
+26174,26175,26176,26177,26178,26179,26180,26181,26182,26183,26184,26185,
+26186,26187,26188,26189,26190,26191,26192,26193,26194,26195,26196,26197,
+26198,26199,26200,26201,26202,26203,26204,26205,26206,26207,26208,26209,
+26210,26211,26212,26213,26214,26215,26216,26217,26218,26219,26220,26221,
+26222,26223,26224,26225,26226,26227,26228,26229,26230,26231,26232,26233,
+26234,26235,26236,26237,26238,26239,26240,26241,26242,26243,26244,26245,
+26246,26247,26248,26249,26250,26251,26252,26253,26254,26255,26256,26257,
+26258,26259,26260,26261,26262,26263,26264,26265,26266,26267,26268,26269,
+26270,26271,26272,26273,26274,26275,26276,26277,26278,26279,26280,26281,
+26282,26283,26284,26285,26286,26287,26288,26289,26290,26291,26292,26293,
+26294,26295,26296,26297,26298,26299,26300,26301,26302,26303,26304,26305,
+26306,26307,26308,26309,26310,26311,26312,26313,26314,26315,26316,26317,
+26318,26319,26320,26321,26322,26323,26324,26325,26326,26327,26328,26329,
+26330,26331,26332,26333,26334,26335,26336,26337,26338,26339,26340,26341,
+26342,26343,26344,26345,26346,26347,26348,26349,26350,26351,26352,26353,
+26354,26355,26356,26357,26358,26359,26360,26361,26362,26363,26364,26365,
+26366,26367,26368,26369,26370,26371,26372,26373,26374,26375,26376,26377,
+26378,26379,26380,26381,26382,26383,26384,26385,26386,26387,26388,26389,
+26390,26391,26392,26393,26394,26395,26396,26397,26398,26399,26400,26401,
+26402,26403,26404,26405,26406,26407,26408,26409,26410,26411,26412,26413,
+26414,26415,26416,26417,26418,26419,26420,26421,26422,26423,26424,26425,
+26426,26427,26428,26429,26430,26431,26432,26433,26434,26435,26436,26437,
+26438,26439,26440,26441,26442,26443,26444,26445,26446,26447,26448,26449,
+26450,26451,26452,26453,26454,26455,26456,26457,26458,26459,26460,26461,
+26462,26463,26464,26465,26466,26467,26468,26469,26470,26471,26472,26473,
+26474,26475,26476,26477,26478,26479,26480,26481,26482,26483,26484,26485,
+26486,26487,26488,26489,26490,26491,26492,26493,26494,26495,26496,26497,
+26498,26499,26500,26501,26502,26503,26504,26505,26506,26507,26508,26509,
+26510,26511,26512,26513,26514,26515,26516,26517,26518,26519,26520,26521,
+26522,26523,26524,26525,26526,26527,26528,26529,26530,26531,26532,26533,
+26534,26535,26536,26537,26538,26539,26540,26541,26542,26543,26544,26545,
+26546,26547,26548,26549,26550,26551,26552,26553,26554,26555,26556,26557,
+26558,26559,26560,26561,26562,26563,26564,26565,26566,26567,26568,26569,
+26570,26571,26572,26573,26574,26575,26576,26577,26578,26579,26580,26581,
+26582,26583,26584,26585,26586,26587,26588,26589,26590,26591,26592,26593,
+26594,26595,26596,26597,26598,26599,26600,26601,26602,26603,26604,26605,
+26606,26607,26608,26609,26610,26611,26612,26613,26614,26615,26616,26617,
+26618,26619,26620,26621,26622,26623,26624,26625,26626,26627,26628,26629,
+26630,26631,26632,26633,26634,26635,26636,26637,26638,26639,26640,26641,
+26642,26643,26644,26645,26646,26647,26648,26649,26650,26651,26652,26653,
+26654,26655,26656,26657,26658,26659,26660,26661,26662,26663,26664,26665,
+26666,26667,26668,26669,26670,26671,26672,26673,26674,26675,26676,26677,
+26678,26679,26680,26681,26682,26683,26684,26685,26686,26687,26688,26689,
+26690,26691,26692,26693,26694,26695,26696,26697,26698,26699,26700,26701,
+26702,26703,26704,26705,26706,26707,26708,26709,26710,26711,26712,26713,
+26714,26715,26716,26717,26718,26719,26720,26721,26722,26723,26724,26725,
+26726,26727,26728,26729,26730,26731,26732,26733,26734,26735,26736,26737,
+26738,26739,26740,26741,26742,26743,26744,26745,26746,26747,26748,26749,
+26750,26751,26752,26753,26754,26755,26756,26757,26758,26759,26760,26761,
+26762,26763,26764,26765,26766,26767,26768,26769,26770,26771,26772,26773,
+26774,26775,26776,26777,26778,26779,26780,26781,26782,26783,26784,26785,
+26786,26787,26788,26789,26790,26791,26792,26793,26794,26795,26796,26797,
+26798,26799,26800,26801,26802,26803,26804,26805,26806,26807,26808,26809,
+26810,26811,26812,26813,26814,26815,26816,26817,26818,26819,26820,26821,
+26822,26823,26824,26825,26826,26827,26828,26829,26830,26831,26832,26833,
+26834,26835,26836,26837,26838,26839,26840,26841,26842,26843,26844,26845,
+26846,26847,26848,26849,26850,26851,26852,26853,26854,26855,26856,26857,
+26858,26859,26860,26861,26862,26863,26864,26865,26866,26867,26868,26869,
+26870,26871,26872,26873,26874,26875,26876,26877,26878,26879,26880,26881,
+26882,26883,26884,26885,26886,26887,26888,26889,26890,26891,26892,26893,
+26894,26895,26896,26897,26898,26899,26900,26901,26902,26903,26904,26905,
+26906,26907,26908,26909,26910,26911,26912,26913,26914,26915,26916,26917,
+26918,26919,26920,26921,26922,26923,26924,26925,26926,26927,26928,26929,
+26930,26931,26932,26933,26934,26935,26936,26937,26938,26939,26940,26941,
+26942,26943,26944,26945,26946,26947,26948,26949,26950,26951,26952,26953,
+26954,26955,26956,26957,26958,26959,26960,26961,26962,26963,26964,26965,
+26966,26967,26968,26969,26970,26971,26972,26973,26974,26975,26976,26977,
+26978,26979,26980,26981,26982,26983,26984,26985,26986,26987,26988,26989,
+26990,26991,26992,26993,26994,26995,26996,26997,26998,26999,27000,27001,
+27002,27003,27004,27005,27006,27007,27008,27009,27010,27011,27012,27013,
+27014,27015,27016,27017,27018,27019,27020,27021,27022,27023,27024,27025,
+27026,27027,27028,27029,27030,27031,27032,27033,27034,27035,27036,27037,
+27038,27039,27040,27041,27042,27043,27044,27045,27046,27047,27048,27049,
+27050,27051,27052,27053,27054,27055,27056,27057,27058,27059,27060,27061,
+27062,27063,27064,27065,27066,27067,27068,27069,27070,27071,27072,27073,
+27074,27075,27076,27077,27078,27079,27080,27081,27082,27083,27084,27085,
+27086,27087,27088,27089,27090,27091,27092,27093,27094,27095,27096,27097,
+27098,27099,27100,27101,27102,27103,27104,27105,27106,27107,27108,27109,
+27110,27111,27112,27113,27114,27115,27116,27117,27118,27119,27120,27121,
+27122,27123,27124,27125,27126,27127,27128,27129,27130,27131,27132,27133,
+27134,27135,27136,27137,27138,27139,27140,27141,27142,27143,27144,27145,
+27146,27147,27148,27149,27150,27151,27152,27153,27154,27155,27156,27157,
+27158,27159,27160,27161,27162,27163,27164,27165,27166,27167,27168,27169,
+27170,27171,27172,27173,27174,27175,27176,27177,27178,27179,27180,27181,
+27182,27183,27184,27185,27186,27187,27188,27189,27190,27191,27192,27193,
+27194,27195,27196,27197,27198,27199,27200,27201,27202,27203,27204,27205,
+27206,27207,27208,27209,27210,27211,27212,27213,27214,27215,27216,27217,
+27218,27219,27220,27221,27222,27223,27224,27225,27226,27227,27228,27229,
+27230,27231,27232,27233,27234,27235,27236,27237,27238,27239,27240,27241,
+27242,27243,27244,27245,27246,27247,27248,27249,27250,27251,27252,27253,
+27254,27255,27256,27257,27258,27259,27260,27261,27262,27263,27264,27265,
+27266,27267,27268,27269,27270,27271,27272,27273,27274,27275,27276,27277,
+27278,27279,27280,27281,27282,27283,27284,27285,27286,27287,27288,27289,
+27290,27291,27292,27293,27294,27295,27296,27297,27298,27299,27300,27301,
+27302,27303,27304,27305,27306,27307,27308,27309,27310,27311,27312,27313,
+27314,27315,27316,27317,27318,27319,27320,27321,27322,27323,27324,27325,
+27326,27327,27328,27329,27330,27331,27332,27333,27334,27335,27336,27337,
+27338,27339,27340,27341,27342,27343,27344,27345,27346,27347,27348,27349,
+27350,27351,27352,27353,27354,27355,27356,27357,27358,27359,27360,27361,
+27362,27363,27364,27365,27366,27367,27368,27369,27370,27371,27372,27373,
+27374,27375,27376,27377,27378,27379,27380,27381,27382,27383,27384,27385,
+27386,27387,27388,27389,27390,27391,27392,27393,27394,27395,27396,27397,
+27398,27399,27400,27401,27402,27403,27404,27405,27406,27407,27408,27409,
+27410,27411,27412,27413,27414,27415,27416,27417,27418,27419,27420,27421,
+27422,27423,27424,27425,27426,27427,27428,27429,27430,27431,27432,27433,
+27434,27435,27436,27437,27438,27439,27440,27441,27442,27443,27444,27445,
+27446,27447,27448,27449,27450,27451,27452,27453,27454,27455,27456,27457,
+27458,27459,27460,27461,27462,27463,27464,27465,27466,27467,27468,27469,
+27470,27471,27472,27473,27474,27475,27476,27477,27478,27479,27480,27481,
+27482,27483,27484,27485,27486,27487,27488,27489,27490,27491,27492,27493,
+27494,27495,27496,27497,27498,27499,27500,27501,27502,27503,27504,27505,
+27506,27507,27508,27509,27510,27511,27512,27513,27514,27515,27516,27517,
+27518,27519,27520,27521,27522,27523,27524,27525,27526,27527,27528,27529,
+27530,27531,27532,27533,27534,27535,27536,27537,27538,27539,27540,27541,
+27542,27543,27544,27545,27546,27547,27548,27549,27550,27551,27552,27553,
+27554,27555,27556,27557,27558,27559,27560,27561,27562,27563,27564,27565,
+27566,27567,27568,27569,27570,27571,27572,27573,27574,27575,27576,27577,
+27578,27579,27580,27581,27582,27583,27584,27585,27586,27587,27588,27589,
+27590,27591,27592,27593,27594,27595,27596,27597,27598,27599,27600,27601,
+27602,27603,27604,27605,27606,27607,27608,27609,27610,27611,27612,27613,
+27614,27615,27616,27617,27618,27619,27620,27621,27622,27623,27624,27625,
+27626,27627,27628,27629,27630,27631,27632,27633,27634,27635,27636,27637,
+27638,27639,27640,27641,27642,27643,27644,27645,27646,27647,27648,27649,
+27650,27651,27652,27653,27654,27655,27656,27657,27658,27659,27660,27661,
+27662,27663,27664,27665,27666,27667,27668,27669,27670,27671,27672,27673,
+27674,27675,27676,27677,27678,27679,27680,27681,27682,27683,27684,27685,
+27686,27687,27688,27689,27690,27691,27692,27693,27694,27695,27696,27697,
+27698,27699,27700,27701,27702,27703,27704,27705,27706,27707,27708,27709,
+27710,27711,27712,27713,27714,27715,27716,27717,27718,27719,27720,27721,
+27722,27723,27724,27725,27726,27727,27728,27729,27730,27731,27732,27733,
+27734,27735,27736,27737,27738,27739,27740,27741,27742,27743,27744,27745,
+27746,27747,27748,27749,27750,27751,27752,27753,27754,27755,27756,27757,
+27758,27759,27760,27761,27762,27763,27764,27765,27766,27767,27768,27769,
+27770,27771,27772,27773,27774,27775,27776,27777,27778,27779,27780,27781,
+27782,27783,27784,27785,27786,27787,27788,27789,27790,27791,27792,27793,
+27794,27795,27796,27797,27798,27799,27800,27801,27802,27803,27804,27805,
+27806,27807,27808,27809,27810,27811,27812,27813,27814,27815,27816,27817,
+27818,27819,27820,27821,27822,27823,27824,27825,27826,27827,27828,27829,
+27830,27831,27832,27833,27834,27835,27836,27837,27838,27839,27840,27841,
+27842,27843,27844,27845,27846,27847,27848,27849,27850,27851,27852,27853,
+27854,27855,27856,27857,27858,27859,27860,27861,27862,27863,27864,27865,
+27866,27867,27868,27869,27870,27871,27872,27873,27874,27875,27876,27877,
+27878,27879,27880,27881,27882,27883,27884,27885,27886,27887,27888,27889,
+27890,27891,27892,27893,27894,27895,27896,27897,27898,27899,27900,27901,
+27902,27903,27904,27905,27906,27907,27908,27909,27910,27911,27912,27913,
+27914,27915,27916,27917,27918,27919,27920,27921,27922,27923,27924,27925,
+27926,27927,27928,27929,27930,27931,27932,27933,27934,27935,27936,27937,
+27938,27939,27940,27941,27942,27943,27944,27945,27946,27947,27948,27949,
+27950,27951,27952,27953,27954,27955,27956,27957,27958,27959,27960,27961,
+27962,27963,27964,27965,27966,27967,27968,27969,27970,27971,27972,27973,
+27974,27975,27976,27977,27978,27979,27980,27981,27982,27983,27984,27985,
+27986,27987,27988,27989,27990,27991,27992,27993,27994,27995,27996,27997,
+27998,27999,28000,28001,28002,28003,28004,28005,28006,28007,28008,28009,
+28010,28011,28012,28013,28014,28015,28016,28017,28018,28019,28020,28021,
+28022,28023,28024,28025,28026,28027,28028,28029,28030,28031,28032,28033,
+28034,28035,28036,28037,28038,28039,28040,28041,28042,28043,28044,28045,
+28046,28047,28048,28049,28050,28051,28052,28053,28054,28055,28056,28057,
+28058,28059,28060,28061,28062,28063,28064,28065,28066,28067,28068,28069,
+28070,28071,28072,28073,28074,28075,28076,28077,28078,28079,28080,28081,
+28082,28083,28084,28085,28086,28087,28088,28089,28090,28091,28092,28093,
+28094,28095,28096,28097,28098,28099,28100,28101,28102,28103,28104,28105,
+28106,28107,28108,28109,28110,28111,28112,28113,28114,28115,28116,28117,
+28118,28119,28120,28121,28122,28123,28124,28125,28126,28127,28128,28129,
+28130,28131,28132,28133,28134,28135,28136,28137,28138,28139,28140,28141,
+28142,28143,28144,28145,28146,28147,28148,28149,28150,28151,28152,28153,
+28154,28155,28156,28157,28158,28159,28160,28161,28162,28163,28164,28165,
+28166,28167,28168,28169,28170,28171,28172,28173,28174,28175,28176,28177,
+28178,28179,28180,28181,28182,28183,28184,28185,28186,28187,28188,28189,
+28190,28191,28192,28193,28194,28195,28196,28197,28198,28199,28200,28201,
+28202,28203,28204,28205,28206,28207,28208,28209,28210,28211,28212,28213,
+28214,28215,28216,28217,28218,28219,28220,28221,28222,28223,28224,28225,
+28226,28227,28228,28229,28230,28231,28232,28233,28234,28235,28236,28237,
+28238,28239,28240,28241,28242,28243,28244,28245,28246,28247,28248,28249,
+28250,28251,28252,28253,28254,28255,28256,28257,28258,28259,28260,28261,
+28262,28263,28264,28265,28266,28267,28268,28269,28270,28271,28272,28273,
+28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,28284,28285,
+28286,28287,28288,28289,28290,28291,28292,28293,28294,28295,28296,28297,
+28298,28299,28300,28301,28302,28303,28304,28305,28306,28307,28308,28309,
+28310,28311,28312,28313,28314,28315,28316,28317,28318,28319,28320,28321,
+28322,28323,28324,28325,28326,28327,28328,28329,28330,28331,28332,28333,
+28334,28335,28336,28337,28338,28339,28340,28341,28342,28343,28344,28345,
+28346,28347,28348,28349,28350,28351,28352,28353,28354,28355,28356,28357,
+28358,28359,28360,28361,28362,28363,28364,28365,28366,28367,28368,28369,
+28370,28371,28372,28373,28374,28375,28376,28377,28378,28379,28380,28381,
+28382,28383,28384,28385,28386,28387,28388,28389,28390,28391,28392,28393,
+28394,28395,28396,28397,28398,28399,28400,28401,28402,28403,28404,28405,
+28406,28407,28408,28409,28410,28411,28412,28413,28414,28415,28416,28417,
+28418,28419,28420,28421,28422,28423,28424,28425,28426,28427,28428,28429,
+28430,28431,28432,28433,28434,28435,28436,28437,28438,28439,28440,28441,
+28442,28443,28444,28445,28446,28447,28448,28449,28450,28451,28452,28453,
+28454,28455,28456,28457,28458,28459,28460,28461,28462,28463,28464,28465,
+28466,28467,28468,28469,28470,28471,28472,28473,28474,28475,28476,28477,
+28478,28479,28480,28481,28482,28483,28484,28485,28486,28487,28488,28489,
+28490,28491,28492,28493,28494,28495,28496,28497,28498,28499,28500,28501,
+28502,28503,28504,28505,28506,28507,28508,28509,28510,28511,28512,28513,
+28514,28515,28516,28517,28518,28519,28520,28521,28522,28523,28524,28525,
+28526,28527,28528,28529,28530,28531,28532,28533,28534,28535,28536,28537,
+28538,28539,28540,28541,28542,28543,28544,28545,28546,28547,28548,28549,
+28550,28551,28552,28553,28554,28555,28556,28557,28558,28559,28560,28561,
+28562,28563,28564,28565,28566,28567,28568,28569,28570,28571,28572,28573,
+28574,28575,28576,28577,28578,28579,28580,28581,28582,28583,28584,28585,
+28586,28587,28588,28589,28590,28591,28592,28593,28594,28595,28596,28597,
+28598,28599,28600,28601,28602,28603,28604,28605,28606,28607,28608,28609,
+28610,28611,28612,28613,28614,28615,28616,28617,28618,28619,28620,28621,
+28622,28623,28624,28625,28626,28627,28628,28629,28630,28631,28632,28633,
+28634,28635,28636,28637,28638,28639,28640,28641,28642,28643,28644,28645,
+28646,28647,28648,28649,28650,28651,28652,28653,28654,28655,28656,28657,
+28658,28659,28660,28661,28662,28663,28664,28665,28666,28667,28668,28669,
+28670,28671,28672,28673,28674,28675,28676,28677,28678,28679,28680,28681,
+28682,28683,28684,28685,28686,28687,28688,28689,28690,28691,28692,28693,
+28694,28695,28696,28697,28698,28699,28700,28701,28702,28703,28704,28705,
+28706,28707,28708,28709,28710,28711,28712,28713,28714,28715,28716,28717,
+28718,28719,28720,28721,28722,28723,28724,28725,28726,28727,28728,28729,
+28730,28731,28732,28733,28734,28735,28736,28737,28738,28739,28740,28741,
+28742,28743,28744,28745,28746,28747,28748,28749,28750,28751,28752,28753,
+28754,28755,28756,28757,28758,28759,28760,28761,28762,28763,28764,28765,
+28766,28767,28768,28769,28770,28771,28772,28773,28774,28775,28776,28777,
+28778,28779,28780,28781,28782,28783,28784,28785,28786,28787,28788,28789,
+28790,28791,28792,28793,28794,28795,28796,28797,28798,28799,28800,28801,
+28802,28803,28804,28805,28806,28807,28808,28809,28810,28811,28812,28813,
+28814,28815,28816,28817,28818,28819,28820,28821,28822,28823,28824,28825,
+28826,28827,28828,28829,28830,28831,28832,28833,28834,28835,28836,28837,
+28838,28839,28840,28841,28842,28843,28844,28845,28846,28847,28848,28849,
+28850,28851,28852,28853,28854,28855,28856,28857,28858,28859,28860,28861,
+28862,28863,28864,28865,28866,28867,28868,28869,28870,28871,28872,28873,
+28874,28875,28876,28877,28878,28879,28880,28881,28882,28883,28884,28885,
+28886,28887,28888,28889,28890,28891,28892,28893,28894,28895,28896,28897,
+28898,28899,28900,28901,28902,28903,28904,28905,28906,28907,28908,28909,
+28910,28911,28912,28913,28914,28915,28916,28917,28918,28919,28920,28921,
+28922,28923,28924,28925,28926,28927,28928,28929,28930,28931,28932,28933,
+28934,28935,28936,28937,28938,28939,28940,28941,28942,28943,28944,28945,
+28946,28947,28948,28949,28950,28951,28952,28953,28954,28955,28956,28957,
+28958,28959,28960,28961,28962,28963,28964,28965,28966,28967,28968,28969,
+28970,28971,28972,28973,28974,28975,28976,28977,28978,28979,28980,28981,
+28982,28983,28984,28985,28986,28987,28988,28989,28990,28991,28992,28993,
+28994,28995,28996,28997,28998,28999,29000,29001,29002,29003,29004,29005,
+29006,29007,29008,29009,29010,29011,29012,29013,29014,29015,29016,29017,
+29018,29019,29020,29021,29022,29023,29024,29025,29026,29027,29028,29029,
+29030,29031,29032,29033,29034,29035,29036,29037,29038,29039,29040,29041,
+29042,29043,29044,29045,29046,29047,29048,29049,29050,29051,29052,29053,
+29054,29055,29056,29057,29058,29059,29060,29061,29062,29063,29064,29065,
+29066,29067,29068,29069,29070,29071,29072,29073,29074,29075,29076,29077,
+29078,29079,29080,29081,29082,29083,29084,29085,29086,29087,29088,29089,
+29090,29091,29092,29093,29094,29095,29096,29097,29098,29099,29100,29101,
+29102,29103,29104,29105,29106,29107,29108,29109,29110,29111,29112,29113,
+29114,29115,29116,29117,29118,29119,29120,29121,29122,29123,29124,29125,
+29126,29127,29128,29129,29130,29131,29132,29133,29134,29135,29136,29137,
+29138,29139,29140,29141,29142,29143,29144,29145,29146,29147,29148,29149,
+29150,29151,29152,29153,29154,29155,29156,29157,29158,29159,29160,29161,
+29162,29163,29164,29165,29166,29167,29168,29169,29170,29171,29172,29173,
+29174,29175,29176,29177,29178,29179,29180,29181,29182,29183,29184,29185,
+29186,29187,29188,29189,29190,29191,29192,29193,29194,29195,29196,29197,
+29198,29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,
+29210,29211,29212,29213,29214,29215,29216,29217,29218,29219,29220,29221,
+29222,29223,29224,29225,29226,29227,29228,29229,29230,29231,29232,29233,
+29234,29235,29236,29237,29238,29239,29240,29241,29242,29243,29244,29245,
+29246,29247,29248,29249,29250,29251,29252,29253,29254,29255,29256,29257,
+29258,29259,29260,29261,29262,29263,29264,29265,29266,29267,29268,29269,
+29270,29271,29272,29273,29274,29275,29276,29277,29278,29279,29280,29281,
+29282,29283,29284,29285,29286,29287,29288,29289,29290,29291,29292,29293,
+29294,29295,29296,29297,29298,29299,29300,29301,29302,29303,29304,29305,
+29306,29307,29308,29309,29310,29311,29312,29313,29314,29315,29316,29317,
+29318,29319,29320,29321,29322,29323,29324,29325,29326,29327,29328,29329,
+29330,29331,29332,29333,29334,29335,29336,29337,29338,29339,29340,29341,
+29342,29343,29344,29345,29346,29347,29348,29349,29350,29351,29352,29353,
+29354,29355,29356,29357,29358,29359,29360,29361,29362,29363,29364,29365,
+29366,29367,29368,29369,29370,29371,29372,29373,29374,29375,29376,29377,
+29378,29379,29380,29381,29382,29383,29384,29385,29386,29387,29388,29389,
+29390,29391,29392,29393,29394,29395,29396,29397,29398,29399,29400,29401,
+29402,29403,29404,29405,29406,29407,29408,29409,29410,29411,29412,29413,
+29414,29415,29416,29417,29418,29419,29420,29421,29422,29423,29424,29425,
+29426,29427,29428,29429,29430,29431,29432,29433,29434,29435,29436,29437,
+29438,29439,29440,29441,29442,29443,29444,29445,29446,29447,29448,29449,
+29450,29451,29452,29453,29454,29455,29456,29457,29458,29459,29460,29461,
+29462,29463,29464,29465,29466,29467,29468,29469,29470,29471,29472,29473,
+29474,29475,29476,29477,29478,29479,29480,29481,29482,29483,29484,29485,
+29486,29487,29488,29489,29490,29491,29492,29493,29494,29495,29496,29497,
+29498,29499,29500,29501,29502,29503,29504,29505,29506,29507,29508,29509,
+29510,29511,29512,29513,29514,29515,29516,29517,29518,29519,29520,29521,
+29522,29523,29524,29525,29526,29527,29528,29529,29530,29531,29532,29533,
+29534,29535,29536,29537,29538,29539,29540,29541,29542,29543,29544,29545,
+29546,29547,29548,29549,29550,29551,29552,29553,29554,29555,29556,29557,
+29558,29559,29560,29561,29562,29563,29564,29565,29566,29567,29568,29569,
+29570,29571,29572,29573,29574,29575,29576,29577,29578,29579,29580,29581,
+29582,29583,29584,29585,29586,29587,29588,29589,29590,29591,29592,29593,
+29594,29595,29596,29597,29598,29599,29600,29601,29602,29603,29604,29605,
+29606,29607,29608,29609,29610,29611,29612,29613,29614,29615,29616,29617,
+29618,29619,29620,29621,29622,29623,29624,29625,29626,29627,29628,29629,
+29630,29631,29632,29633,29634,29635,29636,29637,29638,29639,29640,29641,
+29642,29643,29644,29645,29646,29647,29648,29649,29650,29651,29652,29653,
+29654,29655,29656,29657,29658,29659,29660,29661,29662,29663,29664,29665,
+29666,29667,29668,29669,29670,29671,29672,29673,29674,29675,29676,29677,
+29678,29679,29680,29681,29682,29683,29684,29685,29686,29687,29688,29689,
+29690,29691,29692,29693,29694,29695,29696,29697,29698,29699,29700,29701,
+29702,29703,29704,29705,29706,29707,29708,29709,29710,29711,29712,29713,
+29714,29715,29716,29717,29718,29719,29720,29721,29722,29723,29724,29725,
+29726,29727,29728,29729,29730,29731,29732,29733,29734,29735,29736,29737,
+29738,29739,29740,29741,29742,29743,29744,29745,29746,29747,29748,29749,
+29750,29751,29752,29753,29754,29755,29756,29757,29758,29759,29760,29761,
+29762,29763,29764,29765,29766,29767,29768,29769,29770,29771,29772,29773,
+29774,29775,29776,29777,29778,29779,29780,29781,29782,29783,29784,29785,
+29786,29787,29788,29789,29790,29791,29792,29793,29794,29795,29796,29797,
+29798,29799,29800,29801,29802,29803,29804,29805,29806,29807,29808,29809,
+29810,29811,29812,29813,29814,29815,29816,29817,29818,29819,29820,29821,
+29822,29823,29824,29825,29826,29827,29828,29829,29830,29831,29832,29833,
+29834,29835,29836,29837,29838,29839,29840,29841,29842,29843,29844,29845,
+29846,29847,29848,29849,29850,29851,29852,29853,29854,29855,29856,29857,
+29858,29859,29860,29861,29862,29863,29864,29865,29866,29867,29868,29869,
+29870,29871,29872,29873,29874,29875,29876,29877,29878,29879,29880,29881,
+29882,29883,29884,29885,29886,29887,29888,29889,29890,29891,29892,29893,
+29894,29895,29896,29897,29898,29899,29900,29901,29902,29903,29904,29905,
+29906,29907,29908,29909,29910,29911,29912,29913,29914,29915,29916,29917,
+29918,29919,29920,29921,29922,29923,29924,29925,29926,29927,29928,29929,
+29930,29931,29932,29933,29934,29935,29936,29937,29938,29939,29940,29941,
+29942,29943,29944,29945,29946,29947,29948,29949,29950,29951,29952,29953,
+29954,29955,29956,29957,29958,29959,29960,29961,29962,29963,29964,29965,
+29966,29967,29968,29969,29970,29971,29972,29973,29974,29975,29976,29977,
+29978,29979,29980,29981,29982,29983,29984,29985,29986,29987,29988,29989,
+29990,29991,29992,29993,29994,29995,29996,29997,29998,29999,30000,30001,
+30002,30003,30004,30005,30006,30007,30008,30009,30010,30011,30012,30013,
+30014,30015,30016,30017,30018,30019,30020,30021,30022,30023,30024,30025,
+30026,30027,30028,30029,30030,30031,30032,30033,30034,30035,30036,30037,
+30038,30039,30040,30041,30042,30043,30044,30045,30046,30047,30048,30049,
+30050,30051,30052,30053,30054,30055,30056,30057,30058,30059,30060,30061,
+30062,30063,30064,30065,30066,30067,30068,30069,30070,30071,30072,30073,
+30074,30075,30076,30077,30078,30079,30080,30081,30082,30083,30084,30085,
+30086,30087,30088,30089,30090,30091,30092,30093,30094,30095,30096,30097,
+30098,30099,30100,30101,30102,30103,30104,30105,30106,30107,30108,30109,
+30110,30111,30112,30113,30114,30115,30116,30117,30118,30119,30120,30121,
+30122,30123,30124,30125,30126,30127,30128,30129,30130,30131,30132,30133,
+30134,30135,30136,30137,30138,30139,30140,30141,30142,30143,30144,30145,
+30146,30147,30148,30149,30150,30151,30152,30153,30154,30155,30156,30157,
+30158,30159,30160,30161,30162,30163,30164,30165,30166,30167,30168,30169,
+30170,30171,30172,30173,30174,30175,30176,30177,30178,30179,30180,30181,
+30182,30183,30184,30185,30186,30187,30188,30189,30190,30191,30192,30193,
+30194,30195,30196,30197,30198,30199,30200,30201,30202,30203,30204,30205,
+30206,30207,30208,30209,30210,30211,30212,30213,30214,30215,30216,30217,
+30218,30219,30220,30221,30222,30223,30224,30225,30226,30227,30228,30229,
+30230,30231,30232,30233,30234,30235,30236,30237,30238,30239,30240,30241,
+30242,30243,30244,30245,30246,30247,30248,30249,30250,30251,30252,30253,
+30254,30255,30256,30257,30258,30259,30260,30261,30262,30263,30264,30265,
+30266,30267,30268,30269,30270,30271,30272,30273,30274,30275,30276,30277,
+30278,30279,30280,30281,30282,30283,30284,30285,30286,30287,30288,30289,
+30290,30291,30292,30293,30294,30295,30296,30297,30298,30299,30300,30301,
+30302,30303,30304,30305,30306,30307,30308,30309,30310,30311,30312,30313,
+30314,30315,30316,30317,30318,30319,30320,30321,30322,30323,30324,30325,
+30326,30327,30328,30329,30330,30331,30332,30333,30334,30335,30336,30337,
+30338,30339,30340,30341,30342,30343,30344,30345,30346,30347,30348,30349,
+30350,30351,30352,30353,30354,30355,30356,30357,30358,30359,30360,30361,
+30362,30363,30364,30365,30366,30367,30368,30369,30370,30371,30372,30373,
+30374,30375,30376,30377,30378,30379,30380,30381,30382,30383,30384,30385,
+30386,30387,30388,30389,30390,30391,30392,30393,30394,30395,30396,30397,
+30398,30399,30400,30401,30402,30403,30404,30405,30406,30407,30408,30409,
+30410,30411,30412,30413,30414,30415,30416,30417,30418,30419,30420,30421,
+30422,30423,30424,30425,30426,30427,30428,30429,30430,30431,30432,30433,
+30434,30435,30436,30437,30438,30439,30440,30441,30442,30443,30444,30445,
+30446,30447,30448,30449,30450,30451,30452,30453,30454,30455,30456,30457,
+30458,30459,30460,30461,30462,30463,30464,30465,30466,30467,30468,30469,
+30470,30471,30472,30473,30474,30475,30476,30477,30478,30479,30480,30481,
+30482,30483,30484,30485,30486,30487,30488,30489,30490,30491,30492,30493,
+30494,30495,30496,30497,30498,30499,30500,30501,30502,30503,30504,30505,
+30506,30507,30508,30509,30510,30511,30512,30513,30514,30515,30516,30517,
+30518,30519,30520,30521,30522,30523,30524,30525,30526,30527,30528,30529,
+30530,30531,30532,30533,30534,30535,30536,30537,30538,30539,30540,30541,
+30542,30543,30544,30545,30546,30547,30548,30549,30550,30551,30552,30553,
+30554,30555,30556,30557,30558,30559,30560,30561,30562,30563,30564,30565,
+30566,30567,30568,30569,30570,30571,30572,30573,30574,30575,30576,30577,
+30578,30579,30580,30581,30582,30583,30584,30585,30586,30587,30588,30589,
+30590,30591,30592,30593,30594,30595,30596,30597,30598,30599,30600,30601,
+30602,30603,30604,30605,30606,30607,30608,30609,30610,30611,30612,30613,
+30614,30615,30616,30617,30618,30619,30620,30621,30622,30623,30624,30625,
+30626,30627,30628,30629,30630,30631,30632,30633,30634,30635,30636,30637,
+30638,30639,30640,30641,30642,30643,30644,30645,30646,30647,30648,30649,
+30650,30651,30652,30653,30654,30655,30656,30657,30658,30659,30660,30661,
+30662,30663,30664,30665,30666,30667,30668,30669,30670,30671,30672,30673,
+30674,30675,30676,30677,30678,30679,30680,30681,30682,30683,30684,30685,
+30686,30687,30688,30689,30690,30691,30692,30693,30694,30695,30696,30697,
+30698,30699,30700,30701,30702,30703,30704,30705,30706,30707,30708,30709,
+30710,30711,30712,30713,30714,30715,30716,30717,30718,30719,30720,30721,
+30722,30723,30724,30725,30726,30727,30728,30729,30730,30731,30732,30733,
+30734,30735,30736,30737,30738,30739,30740,30741,30742,30743,30744,30745,
+30746,30747,30748,30749,30750,30751,30752,30753,30754,30755,30756,30757,
+30758,30759,30760,30761,30762,30763,30764,30765,30766,30767,30768,30769,
+30770,30771,30772,30773,30774,30775,30776,30777,30778,30779,30780,30781,
+30782,30783,30784,30785,30786,30787,30788,30789,30790,30791,30792,30793,
+30794,30795,30796,30797,30798,30799,30800,30801,30802,30803,30804,30805,
+30806,30807,30808,30809,30810,30811,30812,30813,30814,30815,30816,30817,
+30818,30819,30820,30821,30822,30823,30824,30825,30826,30827,30828,30829,
+30830,30831,30832,30833,30834,30835,30836,30837,30838,30839,30840,30841,
+30842,30843,30844,30845,30846,30847,30848,30849,30850,30851,30852,30853,
+30854,30855,30856,30857,30858,30859,30860,30861,30862,30863,30864,30865,
+30866,30867,30868,30869,30870,30871,30872,30873,30874,30875,30876,30877,
+30878,30879,30880,30881,30882,30883,30884,30885,30886,30887,30888,30889,
+30890,30891,30892,30893,30894,30895,30896,30897,30898,30899,30900,30901,
+30902,30903,30904,30905,30906,30907,30908,30909,30910,30911,30912,30913,
+30914,30915,30916,30917,30918,30919,30920,30921,30922,30923,30924,30925,
+30926,30927,30928,30929,30930,30931,30932,30933,30934,30935,30936,30937,
+30938,30939,30940,30941,30942,30943,30944,30945,30946,30947,30948,30949,
+30950,30951,30952,30953,30954,30955,30956,30957,30958,30959,30960,30961,
+30962,30963,30964,30965,30966,30967,30968,30969,30970,30971,30972,30973,
+30974,30975,30976,30977,30978,30979,30980,30981,30982,30983,30984,30985,
+30986,30987,30988,30989,30990,30991,30992,30993,30994,30995,30996,30997,
+30998,30999,31000,31001,31002,31003,31004,31005,31006,31007,31008,31009,
+31010,31011,31012,31013,31014,31015,31016,31017,31018,31019,31020,31021,
+31022,31023,31024,31025,31026,31027,31028,31029,31030,31031,31032,31033,
+31034,31035,31036,31037,31038,31039,31040,31041,31042,31043,31044,31045,
+31046,31047,31048,31049,31050,31051,31052,31053,31054,31055,31056,31057,
+31058,31059,31060,31061,31062,31063,31064,31065,31066,31067,31068,31069,
+31070,31071,31072,31073,31074,31075,31076,31077,31078,31079,31080,31081,
+31082,31083,31084,31085,31086,31087,31088,31089,31090,31091,31092,31093,
+31094,31095,31096,31097,31098,31099,31100,31101,31102,31103,31104,31105,
+31106,31107,31108,31109,31110,31111,31112,31113,31114,31115,31116,31117,
+31118,31119,31120,31121,31122,31123,31124,31125,31126,31127,31128,31129,
+31130,31131,31132,31133,31134,31135,31136,31137,31138,31139,31140,31141,
+31142,31143,31144,31145,31146,31147,31148,31149,31150,31151,31152,31153,
+31154,31155,31156,31157,31158,31159,31160,31161,31162,31163,31164,31165,
+31166,31167,31168,31169,31170,31171,31172,31173,31174,31175,31176,31177,
+31178,31179,31180,31181,31182,31183,31184,31185,31186,31187,31188,31189,
+31190,31191,31192,31193,31194,31195,31196,31197,31198,31199,31200,31201,
+31202,31203,31204,31205,31206,31207,31208,31209,31210,31211,31212,31213,
+31214,31215,31216,31217,31218,31219,31220,31221,31222,31223,31224,31225,
+31226,31227,31228,31229,31230,31231,31232,31233,31234,31235,31236,31237,
+31238,31239,31240,31241,31242,31243,31244,31245,31246,31247,31248,31249,
+31250,31251,31252,31253,31254,31255,31256,31257,31258,31259,31260,31261,
+31262,31263,31264,31265,31266,31267,31268,31269,31270,31271,31272,31273,
+31274,31275,31276,31277,31278,31279,31280,31281,31282,31283,31284,31285,
+31286,31287,31288,31289,31290,31291,31292,31293,31294,31295,31296,31297,
+31298,31299,31300,31301,31302,31303,31304,31305,31306,31307,31308,31309,
+31310,31311,31312,31313,31314,31315,31316,31317,31318,31319,31320,31321,
+31322,31323,31324,31325,31326,31327,31328,31329,31330,31331,31332,31333,
+31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,31344,31345,
+31346,31347,31348,31349,31350,31351,31352,31353,31354,31355,31356,31357,
+31358,31359,31360,31361,31362,31363,31364,31365,31366,31367,31368,31369,
+31370,31371,31372,31373,31374,31375,31376,31377,31378,31379,31380,31381,
+31382,31383,31384,31385,31386,31387,31388,31389,31390,31391,31392,31393,
+31394,31395,31396,31397,31398,31399,31400,31401,31402,31403,31404,31405,
+31406,31407,31408,31409,31410,31411,31412,31413,31414,31415,31416,31417,
+31418,31419,31420,31421,31422,31423,31424,31425,31426,31427,31428,31429,
+31430,31431,31432,31433,31434,31435,31436,31437,31438,31439,31440,31441,
+31442,31443,31444,31445,31446,31447,31448,31449,31450,31451,31452,31453,
+31454,31455,31456,31457,31458,31459,31460,31461,31462,31463,31464,31465,
+31466,31467,31468,31469,31470,31471,31472,31473,31474,31475,31476,31477,
+31478,31479,31480,31481,31482,31483,31484,31485,31486,31487,31488,31489,
+31490,31491,31492,31493,31494,31495,31496,31497,31498,31499,31500,31501,
+31502,31503,31504,31505,31506,31507,31508,31509,31510,31511,31512,31513,
+31514,31515,31516,31517,31518,31519,31520,31521,31522,31523,31524,31525,
+31526,31527,31528,31529,31530,31531,31532,31533,31534,31535,31536,31537,
+31538,31539,31540,31541,31542,31543,31544,31545,31546,31547,31548,31549,
+31550,31551,31552,31553,31554,31555,31556,31557,31558,31559,31560,31561,
+31562,31563,31564,31565,31566,31567,31568,31569,31570,31571,31572,31573,
+31574,31575,31576,31577,31578,31579,31580,31581,31582,31583,31584,31585,
+31586,31587,31588,31589,31590,31591,31592,31593,31594,31595,31596,31597,
+31598,31599,31600,31601,31602,31603,31604,31605,31606,31607,31608,31609,
+31610,31611,31612,31613,31614,31615,31616,31617,31618,31619,31620,31621,
+31622,31623,31624,31625,31626,31627,31628,31629,31630,31631,31632,31633,
+31634,31635,31636,31637,31638,31639,31640,31641,31642,31643,31644,31645,
+31646,31647,31648,31649,31650,31651,31652,31653,31654,31655,31656,31657,
+31658,31659,31660,31661,31662,31663,31664,31665,31666,31667,31668,31669,
+31670,31671,31672,31673,31674,31675,31676,31677,31678,31679,31680,31681,
+31682,31683,31684,31685,31686,31687,31688,31689,31690,31691,31692,31693,
+31694,31695,31696,31697,31698,31699,31700,31701,31702,31703,31704,31705,
+31706,31707,31708,31709,31710,31711,31712,31713,31714,31715,31716,31717,
+31718,31719,31720,31721,31722,31723,31724,31725,31726,31727,31728,31729,
+31730,31731,31732,31733,31734,31735,31736,31737,31738,31739,31740,31741,
+31742,31743,31744,31745,31746,31747,31748,31749,31750,31751,31752,31753,
+31754,31755,31756,31757,31758,31759,31760,31761,31762,31763,31764,31765,
+31766,31767,31768,31769,31770,31771,31772,31773,31774,31775,31776,31777,
+31778,31779,31780,31781,31782,31783,31784,31785,31786,31787,31788,31789,
+31790,31791,31792,31793,31794,31795,31796,31797,31798,31799,31800,31801,
+31802,31803,31804,31805,31806,31807,31808,31809,31810,31811,31812,31813,
+31814,31815,31816,31817,31818,31819,31820,31821,31822,31823,31824,31825,
+31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837,
+31838,31839,31840,31841,31842,31843,31844,31845,31846,31847,31848,31849,
+31850,31851,31852,31853,31854,31855,31856,31857,31858,31859,31860,31861,
+31862,31863,31864,31865,31866,31867,31868,31869,31870,31871,31872,31873,
+31874,31875,31876,31877,31878,31879,31880,31881,31882,31883,31884,31885,
+31886,31887,31888,31889,31890,31891,31892,31893,31894,31895,31896,31897,
+31898,31899,31900,31901,31902,31903,31904,31905,31906,31907,31908,31909,
+31910,31911,31912,31913,31914,31915,31916,31917,31918,31919,31920,31921,
+31922,31923,31924,31925,31926,31927,31928,31929,31930,31931,31932,31933,
+31934,31935,31936,31937,31938,31939,31940,31941,31942,31943,31944,31945,
+31946,31947,31948,31949,31950,31951,31952,31953,31954,31955,31956,31957,
+31958,31959,31960,31961,31962,31963,31964,31965,31966,31967,31968,31969,
+31970,31971,31972,31973,31974,31975,31976,31977,31978,31979,31980,31981,
+31982,31983,31984,31985,31986,31987,31988,31989,31990,31991,31992,31993,
+31994,31995,31996,31997,31998,31999,32000,32001,32002,32003,32004,32005,
+32006,32007,32008,32009,32010,32011,32012,32013,32014,32015,32016,32017,
+32018,32019,32020,32021,32022,32023,32024,32025,32026,32027,32028,32029,
+32030,32031,32032,32033,32034,32035,32036,32037,32038,32039,32040,32041,
+32042,32043,32044,32045,32046,32047,32048,32049,32050,32051,32052,32053,
+32054,32055,32056,32057,32058,32059,32060,32061,32062,32063,32064,32065,
+32066,32067,32068,32069,32070,32071,32072,32073,32074,32075,32076,32077,
+32078,32079,32080,32081,32082,32083,32084,32085,32086,32087,32088,32089,
+32090,32091,32092,32093,32094,32095,32096,32097,32098,32099,32100,32101,
+32102,32103,32104,32105,32106,32107,32108,32109,32110,32111,32112,32113,
+32114,32115,32116,32117,32118,32119,32120,32121,32122,32123,32124,32125,
+32126,32127,32128,32129,32130,32131,32132,32133,32134,32135,32136,32137,
+32138,32139,32140,32141,32142,32143,32144,32145,32146,32147,32148,32149,
+32150,32151,32152,32153,32154,32155,32156,32157,32158,32159,32160,32161,
+32162,32163,32164,32165,32166,32167,32168,32169,32170,32171,32172,32173,
+32174,32175,32176,32177,32178,32179,32180,32181,32182,32183,32184,32185,
+32186,32187,32188,32189,32190,32191,32192,32193,32194,32195,32196,32197,
+32198,32199,32200,32201,32202,32203,32204,32205,32206,32207,32208,32209,
+32210,32211,32212,32213,32214,32215,32216,32217,32218,32219,32220,32221,
+32222,32223,32224,32225,32226,32227,32228,32229,32230,32231,32232,32233,
+32234,32235,32236,32237,32238,32239,32240,32241,32242,32243,32244,32245,
+32246,32247,32248,32249,32250,32251,32252,32253,32254,32255,32256,32257,
+32258,32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,
+32270,32271,32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,
+32282,32283,32284,32285,32286,32287,32288,32289,32290,32291,32292,32293,
+32294,32295,32296,32297,32298,32299,32300,32301,32302,32303,32304,32305,
+32306,32307,32308,32309,32310,32311,32312,32313,32314,32315,32316,32317,
+32318,32319,32320,32321,32322,32323,32324,32325,32326,32327,32328,32329,
+32330,32331,32332,32333,32334,32335,32336,32337,32338,32339,32340,32341,
+32342,32343,32344,32345,32346,32347,32348,32349,32350,32351,32352,32353,
+32354,32355,32356,32357,32358,32359,32360,32361,32362,32363,32364,32365,
+32366,32367,32368,32369,32370,32371,32372,32373,32374,32375,32376,32377,
+32378,32379,32380,32381,32382,32383,32384,32385,32386,32387,32388,32389,
+32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,
+32402,32403,32404,32405,32406,32407,32408,32409,32410,32411,32412,32413,
+32414,32415,32416,32417,32418,32419,32420,32421,32422,32423,32424,32425,
+32426,32427,32428,32429,32430,32431,32432,32433,32434,32435,32436,32437,
+32438,32439,32440,32441,32442,32443,32444,32445,32446,32447,32448,32449,
+32450,32451,32452,32453,32454,32455,32456,32457,32458,32459,32460,32461,
+32462,32463,32464,32465,32466,32467,32468,32469,32470,32471,32472,32473,
+32474,32475,32476,32477,32478,32479,32480,32481,32482,32483,32484,32485,
+32486,32487,32488,32489,32490,32491,32492,32493,32494,32495,32496,32497,
+32498,32499,32500,32501,32502,32503,32504,32505,32506,32507,32508,32509,
+32510,32511,32512,32513,32514,32515,32516,32517,32518,32519,32520,32521,
+32522,32523,32524,32525,32526,32527,32528,32529,32530,32531,32532,32533,
+32534,32535,32536,32537,32538,32539,32540,32541,32542,32543,32544,32545,
+32546,32547,32548,32549,32550,32551,32552,32553,32554,32555,32556,32557,
+32558,32559,32560,32561,32562,32563,32564,32565,32566,32567,32568,32569,
+32570,32571,32572,32573,32574,32575,32576,32577,32578,32579,32580,32581,
+32582,32583,32584,32585,32586,32587,32588,32589,32590,32591,32592,32593,
+32594,32595,32596,32597,32598,32599,32600,32601,32602,32603,32604,32605,
+32606,32607,32608,32609,32610,32611,32612,32613,32614,32615,32616,32617,
+32618,32619,32620,32621,32622,32623,32624,32625,32626,32627,32628,32629,
+32630,32631,32632,32633,32634,32635,32636,32637,32638,32639,32640,32641,
+32642,32643,32644,32645,32646,32647,32648,32649,32650,32651,32652,32653,
+32654,32655,32656,32657,32658,32659,32660,32661,32662,32663,32664,32665,
+32666,32667,32668,32669,32670,32671,32672,32673,32674,32675,32676,32677,
+32678,32679,32680,32681,32682,32683,32684,32685,32686,32687,32688,32689,
+32690,32691,32692,32693,32694,32695,32696,32697,32698,32699,32700,32701,
+32702,32703,32704,32705,32706,32707,32708,32709,32710,32711,32712,32713,
+32714,32715,32716,32717,32718,32719,32720,32721,32722,32723,32724,32725,
+32726,32727,32728,32729,32730,32731,32732,32733,32734,32735,32736,32737,
+32738,32739,32740,32741,32742,32743,32744,32745,32746,32747,32748,32749,
+32750,32751,32752,32753,32754,32755,32756,32757,32758,32759,32760,32761,
+32762,32763,32764,32765,32766,32767,32768,32769,32770,32771,32772,32773,
+32774,32775,32776,32777,32778,32779,32780,32781,32782,32783,32784,32785,
+32786,32787,32788,32789,32790,32791,32792,32793,32794,32795,32796,32797,
+32798,32799,32800,32801,32802,32803,32804,32805,32806,32807,32808,32809,
+32810,32811,32812,32813,32814,32815,32816,32817,32818,32819,32820,32821,
+32822,32823,32824,32825,32826,32827,32828,32829,32830,32831,32832,32833,
+32834,32835,32836,32837,32838,32839,32840,32841,32842,32843,32844,32845,
+32846,32847,32848,32849,32850,32851,32852,32853,32854,32855,32856,32857,
+32858,32859,32860,32861,32862,32863,32864,32865,32866,32867,32868,32869,
+32870,32871,32872,32873,32874,32875,32876,32877,32878,32879,32880,32881,
+32882,32883,32884,32885,32886,32887,32888,32889,32890,32891,32892,32893,
+32894,32895,32896,32897,32898,32899,32900,32901,32902,32903,32904,32905,
+32906,32907,32908,32909,32910,32911,32912,32913,32914,32915,32916,32917,
+32918,32919,32920,32921,32922,32923,32924,32925,32926,32927,32928,32929,
+32930,32931,32932,32933,32934,32935,32936,32937,32938,32939,32940,32941,
+32942,32943,32944,32945,32946,32947,32948,32949,32950,32951,32952,32953,
+32954,32955,32956,32957,32958,32959,32960,32961,32962,32963,32964,32965,
+32966,32967,32968,32969,32970,32971,32972,32973,32974,32975,32976,32977,
+32978,32979,32980,32981,32982,32983,32984,32985,32986,32987,32988,32989,
+32990,32991,32992,32993,32994,32995,32996,32997,32998,32999,33000,33001,
+33002,33003,33004,33005,33006,33007,33008,33009,33010,33011,33012,33013,
+33014,33015,33016,33017,33018,33019,33020,33021,33022,33023,33024,33025,
+33026,33027,33028,33029,33030,33031,33032,33033,33034,33035,33036,33037,
+33038,33039,33040,33041,33042,33043,33044,33045,33046,33047,33048,33049,
+33050,33051,33052,33053,33054,33055,33056,33057,33058,33059,33060,33061,
+33062,33063,33064,33065,33066,33067,33068,33069,33070,33071,33072,33073,
+33074,33075,33076,33077,33078,33079,33080,33081,33082,33083,33084,33085,
+33086,33087,33088,33089,33090,33091,33092,33093,33094,33095,33096,33097,
+33098,33099,33100,33101,33102,33103,33104,33105,33106,33107,33108,33109,
+33110,33111,33112,33113,33114,33115,33116,33117,33118,33119,33120,33121,
+33122,33123,33124,33125,33126,33127,33128,33129,33130,33131,33132,33133,
+33134,33135,33136,33137,33138,33139,33140,33141,33142,33143,33144,33145,
+33146,33147,33148,33149,33150,33151,33152,33153,33154,33155,33156,33157,
+33158,33159,33160,33161,33162,33163,33164,33165,33166,33167,33168,33169,
+33170,33171,33172,33173,33174,33175,33176,33177,33178,33179,33180,33181,
+33182,33183,33184,33185,33186,33187,33188,33189,33190,33191,33192,33193,
+33194,33195,33196,33197,33198,33199,33200,33201,33202,33203,33204,33205,
+33206,33207,33208,33209,33210,33211,33212,33213,33214,33215,33216,33217,
+33218,33219,33220,33221,33222,33223,33224,33225,33226,33227,33228,33229,
+33230,33231,33232,33233,33234,33235,33236,33237,33238,33239,33240,33241,
+33242,33243,33244,33245,33246,33247,33248,33249,33250,33251,33252,33253,
+33254,33255,33256,33257,33258,33259,33260,33261,33262,33263,33264,33265,
+33266,33267,33268,33269,33270,33271,33272,33273,33274,33275,33276,33277,
+33278,33279,33280,33281,33282,33283,33284,33285,33286,33287,33288,33289,
+33290,33291,33292,33293,33294,33295,33296,33297,33298,33299,33300,33301,
+33302,33303,33304,33305,33306,33307,33308,33309,33310,33311,33312,33313,
+33314,33315,33316,33317,33318,33319,33320,33321,33322,33323,33324,33325,
+33326,33327,33328,33329,33330,33331,33332,33333,33334,33335,33336,33337,
+33338,33339,33340,33341,33342,33343,33344,33345,33346,33347,33348,33349,
+33350,33351,33352,33353,33354,33355,33356,33357,33358,33359,33360,33361,
+33362,33363,33364,33365,33366,33367,33368,33369,33370,33371,33372,33373,
+33374,33375,33376,33377,33378,33379,33380,33381,33382,33383,33384,33385,
+33386,33387,33388,33389,33390,33391,33392,33393,33394,33395,33396,33397,
+33398,33399,33400,33401,33402,33403,33404,33405,33406,33407,33408,33409,
+33410,33411,33412,33413,33414,33415,33416,33417,33418,33419,33420,33421,
+33422,33423,33424,33425,33426,33427,33428,33429,33430,33431,33432,33433,
+33434,33435,33436,33437,33438,33439,33440,33441,33442,33443,33444,33445,
+33446,33447,33448,33449,33450,33451,33452,33453,33454,33455,33456,33457,
+33458,33459,33460,33461,33462,33463,33464,33465,33466,33467,33468,33469,
+33470,33471,33472,33473,33474,33475,33476,33477,33478,33479,33480,33481,
+33482,33483,33484,33485,33486,33487,33488,33489,33490,33491,33492,33493,
+33494,33495,33496,33497,33498,33499,33500,33501,33502,33503,33504,33505,
+33506,33507,33508,33509,33510,33511,33512,33513,33514,33515,33516,33517,
+33518,33519,33520,33521,33522,33523,33524,33525,33526,33527,33528,33529,
+33530,33531,33532,33533,33534,33535,33536,33537,33538,33539,33540,33541,
+33542,33543,33544,33545,33546,33547,33548,33549,33550,33551,33552,33553,
+33554,33555,33556,33557,33558,33559,33560,33561,33562,33563,33564,33565,
+33566,33567,33568,33569,33570,33571,33572,33573,33574,33575,33576,33577,
+33578,33579,33580,33581,33582,33583,33584,33585,33586,33587,33588,33589,
+33590,33591,33592,33593,33594,33595,33596,33597,33598,33599,33600,33601,
+33602,33603,33604,33605,33606,33607,33608,33609,33610,33611,33612,33613,
+33614,33615,33616,33617,33618,33619,33620,33621,33622,33623,33624,33625,
+33626,33627,33628,33629,33630,33631,33632,33633,33634,33635,33636,33637,
+33638,33639,33640,33641,33642,33643,33644,33645,33646,33647,33648,33649,
+33650,33651,33652,33653,33654,33655,33656,33657,33658,33659,33660,33661,
+33662,33663,33664,33665,33666,33667,33668,33669,33670,33671,33672,33673,
+33674,33675,33676,33677,33678,33679,33680,33681,33682,33683,33684,33685,
+33686,33687,33688,33689,33690,33691,33692,33693,33694,33695,33696,33697,
+33698,33699,33700,33701,33702,33703,33704,33705,33706,33707,33708,33709,
+33710,33711,33712,33713,33714,33715,33716,33717,33718,33719,33720,33721,
+33722,33723,33724,33725,33726,33727,33728,33729,33730,33731,33732,33733,
+33734,33735,33736,33737,33738,33739,33740,33741,33742,33743,33744,33745,
+33746,33747,33748,33749,33750,33751,33752,33753,33754,33755,33756,33757,
+33758,33759,33760,33761,33762,33763,33764,33765,33766,33767,33768,33769,
+33770,33771,33772,33773,33774,33775,33776,33777,33778,33779,33780,33781,
+33782,33783,33784,33785,33786,33787,33788,33789,33790,33791,33792,33793,
+33794,33795,33796,33797,33798,33799,33800,33801,33802,33803,33804,33805,
+33806,33807,33808,33809,33810,33811,33812,33813,33814,33815,33816,33817,
+33818,33819,33820,33821,33822,33823,33824,33825,33826,33827,33828,33829,
+33830,33831,33832,33833,33834,33835,33836,33837,33838,33839,33840,33841,
+33842,33843,33844,33845,33846,33847,33848,33849,33850,33851,33852,33853,
+33854,33855,33856,33857,33858,33859,33860,33861,33862,33863,33864,33865,
+33866,33867,33868,33869,33870,33871,33872,33873,33874,33875,33876,33877,
+33878,33879,33880,33881,33882,33883,33884,33885,33886,33887,33888,33889,
+33890,33891,33892,33893,33894,33895,33896,33897,33898,33899,33900,33901,
+33902,33903,33904,33905,33906,33907,33908,33909,33910,33911,33912,33913,
+33914,33915,33916,33917,33918,33919,33920,33921,33922,33923,33924,33925,
+33926,33927,33928,33929,33930,33931,33932,33933,33934,33935,33936,33937,
+33938,33939,33940,33941,33942,33943,33944,33945,33946,33947,33948,33949,
+33950,33951,33952,33953,33954,33955,33956,33957,33958,33959,33960,33961,
+33962,33963,33964,33965,33966,33967,33968,33969,33970,33971,33972,33973,
+33974,33975,33976,33977,33978,33979,33980,33981,33982,33983,33984,33985,
+33986,33987,33988,33989,33990,33991,33992,33993,33994,33995,33996,33997,
+33998,33999,34000,34001,34002,34003,34004,34005,34006,34007,34008,34009,
+34010,34011,34012,34013,34014,34015,34016,34017,34018,34019,34020,34021,
+34022,34023,34024,34025,34026,34027,34028,34029,34030,34031,34032,34033,
+34034,34035,34036,34037,34038,34039,34040,34041,34042,34043,34044,34045,
+34046,34047,34048,34049,34050,34051,34052,34053,34054,34055,34056,34057,
+34058,34059,34060,34061,34062,34063,34064,34065,34066,34067,34068,34069,
+34070,34071,34072,34073,34074,34075,34076,34077,34078,34079,34080,34081,
+34082,34083,34084,34085,34086,34087,34088,34089,34090,34091,34092,34093,
+34094,34095,34096,34097,34098,34099,34100,34101,34102,34103,34104,34105,
+34106,34107,34108,34109,34110,34111,34112,34113,34114,34115,34116,34117,
+34118,34119,34120,34121,34122,34123,34124,34125,34126,34127,34128,34129,
+34130,34131,34132,34133,34134,34135,34136,34137,34138,34139,34140,34141,
+34142,34143,34144,34145,34146,34147,34148,34149,34150,34151,34152,34153,
+34154,34155,34156,34157,34158,34159,34160,34161,34162,34163,34164,34165,
+34166,34167,34168,34169,34170,34171,34172,34173,34174,34175,34176,34177,
+34178,34179,34180,34181,34182,34183,34184,34185,34186,34187,34188,34189,
+34190,34191,34192,34193,34194,34195,34196,34197,34198,34199,34200,34201,
+34202,34203,34204,34205,34206,34207,34208,34209,34210,34211,34212,34213,
+34214,34215,34216,34217,34218,34219,34220,34221,34222,34223,34224,34225,
+34226,34227,34228,34229,34230,34231,34232,34233,34234,34235,34236,34237,
+34238,34239,34240,34241,34242,34243,34244,34245,34246,34247,34248,34249,
+34250,34251,34252,34253,34254,34255,34256,34257,34258,34259,34260,34261,
+34262,34263,34264,34265,34266,34267,34268,34269,34270,34271,34272,34273,
+34274,34275,34276,34277,34278,34279,34280,34281,34282,34283,34284,34285,
+34286,34287,34288,34289,34290,34291,34292,34293,34294,34295,34296,34297,
+34298,34299,34300,34301,34302,34303,34304,34305,34306,34307,34308,34309,
+34310,34311,34312,34313,34314,34315,34316,34317,34318,34319,34320,34321,
+34322,34323,34324,34325,34326,34327,34328,34329,34330,34331,34332,34333,
+34334,34335,34336,34337,34338,34339,34340,34341,34342,34343,34344,34345,
+34346,34347,34348,34349,34350,34351,34352,34353,34354,34355,34356,34357,
+34358,34359,34360,34361,34362,34363,34364,34365,34366,34367,34368,34369,
+34370,34371,34372,34373,34374,34375,34376,34377,34378,34379,34380,34381,
+34382,34383,34384,34385,34386,34387,34388,34389,34390,34391,34392,34393,
+34394,34395,34396,34397,34398,34399,34400,34401,34402,34403,34404,34405,
+34406,34407,34408,34409,34410,34411,34412,34413,34414,34415,34416,34417,
+34418,34419,34420,34421,34422,34423,34424,34425,34426,34427,34428,34429,
+34430,34431,34432,34433,34434,34435,34436,34437,34438,34439,34440,34441,
+34442,34443,34444,34445,34446,34447,34448,34449,34450,34451,34452,34453,
+34454,34455,34456,34457,34458,34459,34460,34461,34462,34463,34464,34465,
+34466,34467,34468,34469,34470,34471,34472,34473,34474,34475,34476,34477,
+34478,34479,34480,34481,34482,34483,34484,34485,34486,34487,34488,34489,
+34490,34491,34492,34493,34494,34495,34496,34497,34498,34499,34500,34501,
+34502,34503,34504,34505,34506,34507,34508,34509,34510,34511,34512,34513,
+34514,34515,34516,34517,34518,34519,34520,34521,34522,34523,34524,34525,
+34526,34527,34528,34529,34530,34531,34532,34533,34534,34535,34536,34537,
+34538,34539,34540,34541,34542,34543,34544,34545,34546,34547,34548,34549,
+34550,34551,34552,34553,34554,34555,34556,34557,34558,34559,34560,34561,
+34562,34563,34564,34565,34566,34567,34568,34569,34570,34571,34572,34573,
+34574,34575,34576,34577,34578,34579,34580,34581,34582,34583,34584,34585,
+34586,34587,34588,34589,34590,34591,34592,34593,34594,34595,34596,34597,
+34598,34599,34600,34601,34602,34603,34604,34605,34606,34607,34608,34609,
+34610,34611,34612,34613,34614,34615,34616,34617,34618,34619,34620,34621,
+34622,34623,34624,34625,34626,34627,34628,34629,34630,34631,34632,34633,
+34634,34635,34636,34637,34638,34639,34640,34641,34642,34643,34644,34645,
+34646,34647,34648,34649,34650,34651,34652,34653,34654,34655,34656,34657,
+34658,34659,34660,34661,34662,34663,34664,34665,34666,34667,34668,34669,
+34670,34671,34672,34673,34674,34675,34676,34677,34678,34679,34680,34681,
+34682,34683,34684,34685,34686,34687,34688,34689,34690,34691,34692,34693,
+34694,34695,34696,34697,34698,34699,34700,34701,34702,34703,34704,34705,
+34706,34707,34708,34709,34710,34711,34712,34713,34714,34715,34716,34717,
+34718,34719,34720,34721,34722,34723,34724,34725,34726,34727,34728,34729,
+34730,34731,34732,34733,34734,34735,34736,34737,34738,34739,34740,34741,
+34742,34743,34744,34745,34746,34747,34748,34749,34750,34751,34752,34753,
+34754,34755,34756,34757,34758,34759,34760,34761,34762,34763,34764,34765,
+34766,34767,34768,34769,34770,34771,34772,34773,34774,34775,34776,34777,
+34778,34779,34780,34781,34782,34783,34784,34785,34786,34787,34788,34789,
+34790,34791,34792,34793,34794,34795,34796,34797,34798,34799,34800,34801,
+34802,34803,34804,34805,34806,34807,34808,34809,34810,34811,34812,34813,
+34814,34815,34816,34817,34818,34819,34820,34821,34822,34823,34824,34825,
+34826,34827,34828,34829,34830,34831,34832,34833,34834,34835,34836,34837,
+34838,34839,34840,34841,34842,34843,34844,34845,34846,34847,34848,34849,
+34850,34851,34852,34853,34854,34855,34856,34857,34858,34859,34860,34861,
+34862,34863,34864,34865,34866,34867,34868,34869,34870,34871,34872,34873,
+34874,34875,34876,34877,34878,34879,34880,34881,34882,34883,34884,34885,
+34886,34887,34888,34889,34890,34891,34892,34893,34894,34895,34896,34897,
+34898,34899,34900,34901,34902,34903,34904,34905,34906,34907,34908,34909,
+34910,34911,34912,34913,34914,34915,34916,34917,34918,34919,34920,34921,
+34922,34923,34924,34925,34926,34927,34928,34929,34930,34931,34932,34933,
+34934,34935,34936,34937,34938,34939,34940,34941,34942,34943,34944,34945,
+34946,34947,34948,34949,34950,34951,34952,34953,34954,34955,34956,34957,
+34958,34959,34960,34961,34962,34963,34964,34965,34966,34967,34968,34969,
+34970,34971,34972,34973,34974,34975,34976,34977,34978,34979,34980,34981,
+34982,34983,34984,34985,34986,34987,34988,34989,34990,34991,34992,34993,
+34994,34995,34996,34997,34998,34999,35000,35001,35002,35003,35004,35005,
+35006,35007,35008,35009,35010,35011,35012,35013,35014,35015,35016,35017,
+35018,35019,35020,35021,35022,35023,35024,35025,35026,35027,35028,35029,
+35030,35031,35032,35033,35034,35035,35036,35037,35038,35039,35040,35041,
+35042,35043,35044,35045,35046,35047,35048,35049,35050,35051,35052,35053,
+35054,35055,35056,35057,35058,35059,35060,35061,35062,35063,35064,35065,
+35066,35067,35068,35069,35070,35071,35072,35073,35074,35075,35076,35077,
+35078,35079,35080,35081,35082,35083,35084,35085,35086,35087,35088,35089,
+35090,35091,35092,35093,35094,35095,35096,35097,35098,35099,35100,35101,
+35102,35103,35104,35105,35106,35107,35108,35109,35110,35111,35112,35113,
+35114,35115,35116,35117,35118,35119,35120,35121,35122,35123,35124,35125,
+35126,35127,35128,35129,35130,35131,35132,35133,35134,35135,35136,35137,
+35138,35139,35140,35141,35142,35143,35144,35145,35146,35147,35148,35149,
+35150,35151,35152,35153,35154,35155,35156,35157,35158,35159,35160,35161,
+35162,35163,35164,35165,35166,35167,35168,35169,35170,35171,35172,35173,
+35174,35175,35176,35177,35178,35179,35180,35181,35182,35183,35184,35185,
+35186,35187,35188,35189,35190,35191,35192,35193,35194,35195,35196,35197,
+35198,35199,35200,35201,35202,35203,35204,35205,35206,35207,35208,35209,
+35210,35211,35212,35213,35214,35215,35216,35217,35218,35219,35220,35221,
+35222,35223,35224,35225,35226,35227,35228,35229,35230,35231,35232,35233,
+35234,35235,35236,35237,35238,35239,35240,35241,35242,35243,35244,35245,
+35246,35247,35248,35249,35250,35251,35252,35253,35254,35255,35256,35257,
+35258,35259,35260,35261,35262,35263,35264,35265,35266,35267,35268,35269,
+35270,35271,35272,35273,35274,35275,35276,35277,35278,35279,35280,35281,
+35282,35283,35284,35285,35286,35287,35288,35289,35290,35291,35292,35293,
+35294,35295,35296,35297,35298,35299,35300,35301,35302,35303,35304,35305,
+35306,35307,35308,35309,35310,35311,35312,35313,35314,35315,35316,35317,
+35318,35319,35320,35321,35322,35323,35324,35325,35326,35327,35328,35329,
+35330,35331,35332,35333,35334,35335,35336,35337,35338,35339,35340,35341,
+35342,35343,35344,35345,35346,35347,35348,35349,35350,35351,35352,35353,
+35354,35355,35356,35357,35358,35359,35360,35361,35362,35363,35364,35365,
+35366,35367,35368,35369,35370,35371,35372,35373,35374,35375,35376,35377,
+35378,35379,35380,35381,35382,35383,35384,35385,35386,35387,35388,35389,
+35390,35391,35392,35393,35394,35395,35396,35397,35398,35399,35400,35401,
+35402,35403,35404,35405,35406,35407,35408,35409,35410,35411,35412,35413,
+35414,35415,35416,35417,35418,35419,35420,35421,35422,35423,35424,35425,
+35426,35427,35428,35429,35430,35431,35432,35433,35434,35435,35436,35437,
+35438,35439,35440,35441,35442,35443,35444,35445,35446,35447,35448,35449,
+35450,35451,35452,35453,35454,35455,35456,35457,35458,35459,35460,35461,
+35462,35463,35464,35465,35466,35467,35468,35469,35470,35471,35472,35473,
+35474,35475,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,
+35486,35487,35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,
+35498,35499,35500,35501,35502,35503,35504,35505,35506,35507,35508,35509,
+35510,35511,35512,35513,35514,35515,35516,35517,35518,35519,35520,35521,
+35522,35523,35524,35525,35526,35527,35528,35529,35530,35531,35532,35533,
+35534,35535,35536,35537,35538,35539,35540,35541,35542,35543,35544,35545,
+35546,35547,35548,35549,35550,35551,35552,35553,35554,35555,35556,35557,
+35558,35559,35560,35561,35562,35563,35564,35565,35566,35567,35568,35569,
+35570,35571,35572,35573,35574,35575,35576,35577,35578,35579,35580,35581,
+35582,35583,35584,35585,35586,35587,35588,35589,35590,35591,35592,35593,
+35594,35595,35596,35597,35598,35599,35600,35601,35602,35603,35604,35605,
+35606,35607,35608,35609,35610,35611,35612,35613,35614,35615,35616,35617,
+35618,35619,35620,35621,35622,35623,35624,35625,35626,35627,35628,35629,
+35630,35631,35632,35633,35634,35635,35636,35637,35638,35639,35640,35641,
+35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,35652,35653,
+35654,35655,35656,35657,35658,35659,35660,35661,35662,35663,35664,35665,
+35666,35667,35668,35669,35670,35671,35672,35673,35674,35675,35676,35677,
+35678,35679,35680,35681,35682,35683,35684,35685,35686,35687,35688,35689,
+35690,35691,35692,35693,35694,35695,35696,35697,35698,35699,35700,35701,
+35702,35703,35704,35705,35706,35707,35708,35709,35710,35711,35712,35713,
+35714,35715,35716,35717,35718,35719,35720,35721,35722,35723,35724,35725,
+35726,35727,35728,35729,35730,35731,35732,35733,35734,35735,35736,35737,
+35738,35739,35740,35741,35742,35743,35744,35745,35746,35747,35748,35749,
+35750,35751,35752,35753,35754,35755,35756,35757,35758,35759,35760,35761,
+35762,35763,35764,35765,35766,35767,35768,35769,35770,35771,35772,35773,
+35774,35775,35776,35777,35778,35779,35780,35781,35782,35783,35784,35785,
+35786,35787,35788,35789,35790,35791,35792,35793,35794,35795,35796,35797,
+35798,35799,35800,35801,35802,35803,35804,35805,35806,35807,35808,35809,
+35810,35811,35812,35813,35814,35815,35816,35817,35818,35819,35820,35821,
+35822,35823,35824,35825,35826,35827,35828,35829,35830,35831,35832,35833,
+35834,35835,35836,35837,35838,35839,35840,35841,35842,35843,35844,35845,
+35846,35847,35848,35849,35850,35851,35852,35853,35854,35855,35856,35857,
+35858,35859,35860,35861,35862,35863,35864,35865,35866,35867,35868,35869,
+35870,35871,35872,35873,35874,35875,35876,35877,35878,35879,35880,35881,
+35882,35883,35884,35885,35886,35887,35888,35889,35890,35891,35892,35893,
+35894,35895,35896,35897,35898,35899,35900,35901,35902,35903,35904,35905,
+35906,35907,35908,35909,35910,35911,35912,35913,35914,35915,35916,35917,
+35918,35919,35920,35921,35922,35923,35924,35925,35926,35927,35928,35929,
+35930,35931,35932,35933,35934,35935,35936,35937,35938,35939,35940,35941,
+35942,35943,35944,35945,35946,35947,35948,35949,35950,35951,35952,35953,
+35954,35955,35956,35957,35958,35959,35960,35961,35962,35963,35964,35965,
+35966,35967,35968,35969,35970,35971,35972,35973,35974,35975,35976,35977,
+35978,35979,35980,35981,35982,35983,35984,35985,35986,35987,35988,35989,
+35990,35991,35992,35993,35994,35995,35996,35997,35998,35999,36000,36001,
+36002,36003,36004,36005,36006,36007,36008,36009,36010,36011,36012,36013,
+36014,36015,36016,36017,36018,36019,36020,36021,36022,36023,36024,36025,
+36026,36027,36028,36029,36030,36031,36032,36033,36034,36035,36036,36037,
+36038,36039,36040,36041,36042,36043,36044,36045,36046,36047,36048,36049,
+36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,36060,36061,
+36062,36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,36073,
+36074,36075,36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,
+36086,36087,36088,36089,36090,36091,36092,36093,36094,36095,36096,36097,
+36098,36099,36100,36101,36102,36103,36104,36105,36106,36107,36108,36109,
+36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,36121,
+36122,36123,36124,36125,36126,36127,36128,36129,36130,36131,36132,36133,
+36134,36135,36136,36137,36138,36139,36140,36141,36142,36143,36144,36145,
+36146,36147,36148,36149,36150,36151,36152,36153,36154,36155,36156,36157,
+36158,36159,36160,36161,36162,36163,36164,36165,36166,36167,36168,36169,
+36170,36171,36172,36173,36174,36175,36176,36177,36178,36179,36180,36181,
+36182,36183,36184,36185,36186,36187,36188,36189,36190,36191,36192,36193,
+36194,36195,36196,36197,36198,36199,36200,36201,36202,36203,36204,36205,
+36206,36207,36208,36209,36210,36211,36212,36213,36214,36215,36216,36217,
+36218,36219,36220,36221,36222,36223,36224,36225,36226,36227,36228,36229,
+36230,36231,36232,36233,36234,36235,36236,36237,36238,36239,36240,36241,
+36242,36243,36244,36245,36246,36247,36248,36249,36250,36251,36252,36253,
+36254,36255,36256,36257,36258,36259,36260,36261,36262,36263,36264,36265,
+36266,36267,36268,36269,36270,36271,36272,36273,36274,36275,36276,36277,
+36278,36279,36280,36281,36282,36283,36284,36285,36286,36287,36288,36289,
+36290,36291,36292,36293,36294,36295,36296,36297,36298,36299,36300,36301,
+36302,36303,36304,36305,36306,36307,36308,36309,36310,36311,36312,36313,
+36314,36315,36316,36317,36318,36319,36320,36321,36322,36323,36324,36325,
+36326,36327,36328,36329,36330,36331,36332,36333,36334,36335,36336,36337,
+36338,36339,36340,36341,36342,36343,36344,36345,36346,36347,36348,36349,
+36350,36351,36352,36353,36354,36355,36356,36357,36358,36359,36360,36361,
+36362,36363,36364,36365,36366,36367,36368,36369,36370,36371,36372,36373,
+36374,36375,36376,36377,36378,36379,36380,36381,36382,36383,36384,36385,
+36386,36387,36388,36389,36390,36391,36392,36393,36394,36395,36396,36397,
+36398,36399,36400,36401,36402,36403,36404,36405,36406,36407,36408,36409,
+36410,36411,36412,36413,36414,36415,36416,36417,36418,36419,36420,36421,
+36422,36423,36424,36425,36426,36427,36428,36429,36430,36431,36432,36433,
+36434,36435,36436,36437,36438,36439,36440,36441,36442,36443,36444,36445,
+36446,36447,36448,36449,36450,36451,36452,36453,36454,36455,36456,36457,
+36458,36459,36460,36461,36462,36463,36464,36465,36466,36467,36468,36469,
+36470,36471,36472,36473,36474,36475,36476,36477,36478,36479,36480,36481,
+36482,36483,36484,36485,36486,36487,36488,36489,36490,36491,36492,36493,
+36494,36495,36496,36497,36498,36499,36500,36501,36502,36503,36504,36505,
+36506,36507,36508,36509,36510,36511,36512,36513,36514,36515,36516,36517,
+36518,36519,36520,36521,36522,36523,36524,36525,36526,36527,36528,36529,
+36530,36531,36532,36533,36534,36535,36536,36537,36538,36539,36540,36541,
+36542,36543,36544,36545,36546,36547,36548,36549,36550,36551,36552,36553,
+36554,36555,36556,36557,36558,36559,36560,36561,36562,36563,36564,36565,
+36566,36567,36568,36569,36570,36571,36572,36573,36574,36575,36576,36577,
+36578,36579,36580,36581,36582,36583,36584,36585,36586,36587,36588,36589,
+36590,36591,36592,36593,36594,36595,36596,36597,36598,36599,36600,36601,
+36602,36603,36604,36605,36606,36607,36608,36609,36610,36611,36612,36613,
+36614,36615,36616,36617,36618,36619,36620,36621,36622,36623,36624,36625,
+36626,36627,36628,36629,36630,36631,36632,36633,36634,36635,36636,36637,
+36638,36639,36640,36641,36642,36643,36644,36645,36646,36647,36648,36649,
+36650,36651,36652,36653,36654,36655,36656,36657,36658,36659,36660,36661,
+36662,36663,36664,36665,36666,36667,36668,36669,36670,36671,36672,36673,
+36674,36675,36676,36677,36678,36679,36680,36681,36682,36683,36684,36685,
+36686,36687,36688,36689,36690,36691,36692,36693,36694,36695,36696,36697,
+36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708,36709,
+36710,36711,36712,36713,36714,36715,36716,36717,36718,36719,36720,36721,
+36722,36723,36724,36725,36726,36727,36728,36729,36730,36731,36732,36733,
+36734,36735,36736,36737,36738,36739,36740,36741,36742,36743,36744,36745,
+36746,36747,36748,36749,36750,36751,36752,36753,36754,36755,36756,36757,
+36758,36759,36760,36761,36762,36763,36764,36765,36766,36767,36768,36769,
+36770,36771,36772,36773,36774,36775,36776,36777,36778,36779,36780,36781,
+36782,36783,36784,36785,36786,36787,36788,36789,36790,36791,36792,36793,
+36794,36795,36796,36797,36798,36799,36800,36801,36802,36803,36804,36805,
+36806,36807,36808,36809,36810,36811,36812,36813,36814,36815,36816,36817,
+36818,36819,36820,36821,36822,36823,36824,36825,36826,36827,36828,36829,
+36830,36831,36832,36833,36834,36835,36836,36837,36838,36839,36840,36841,
+36842,36843,36844,36845,36846,36847,36848,36849,36850,36851,36852,36853,
+36854,36855,36856,36857,36858,36859,36860,36861,36862,36863,36864,36865,
+36866,36867,36868,36869,36870,36871,36872,36873,36874,36875,36876,36877,
+36878,36879,36880,36881,36882,36883,36884,36885,36886,36887,36888,36889,
+36890,36891,36892,36893,36894,36895,36896,36897,36898,36899,36900,36901,
+36902,36903,36904,36905,36906,36907,36908,36909,36910,36911,36912,36913,
+36914,36915,36916,36917,36918,36919,36920,36921,36922,36923,36924,36925,
+36926,36927,36928,36929,36930,36931,36932,36933,36934,36935,36936,36937,
+36938,36939,36940,36941,36942,36943,36944,36945,36946,36947,36948,36949,
+36950,36951,36952,36953,36954,36955,36956,36957,36958,36959,36960,36961,
+36962,36963,36964,36965,36966,36967,36968,36969,36970,36971,36972,36973,
+36974,36975,36976,36977,36978,36979,36980,36981,36982,36983,36984,36985,
+36986,36987,36988,36989,36990,36991,36992,36993,36994,36995,36996,36997,
+36998,36999,37000,37001,37002,37003,37004,37005,37006,37007,37008,37009,
+37010,37011,37012,37013,37014,37015,37016,37017,37018,37019,37020,37021,
+37022,37023,37024,37025,37026,37027,37028,37029,37030,37031,37032,37033,
+37034,37035,37036,37037,37038,37039,37040,37041,37042,37043,37044,37045,
+37046,37047,37048,37049,37050,37051,37052,37053,37054,37055,37056,37057,
+37058,37059,37060,37061,37062,37063,37064,37065,37066,37067,37068,37069,
+37070,37071,37072,37073,37074,37075,37076,37077,37078,37079,37080,37081,
+37082,37083,37084,37085,37086,37087,37088,37089,37090,37091,37092,37093,
+37094,37095,37096,37097,37098,37099,37100,37101,37102,37103,37104,37105,
+37106,37107,37108,37109,37110,37111,37112,37113,37114,37115,37116,37117,
+37118,37119,37120,37121,37122,37123,37124,37125,37126,37127,37128,37129,
+37130,37131,37132,37133,37134,37135,37136,37137,37138,37139,37140,37141,
+37142,37143,37144,37145,37146,37147,37148,37149,37150,37151,37152,37153,
+37154,37155,37156,37157,37158,37159,37160,37161,37162,37163,37164,37165,
+37166,37167,37168,37169,37170,37171,37172,37173,37174,37175,37176,37177,
+37178,37179,37180,37181,37182,37183,37184,37185,37186,37187,37188,37189,
+37190,37191,37192,37193,37194,37195,37196,37197,37198,37199,37200,37201,
+37202,37203,37204,37205,37206,37207,37208,37209,37210,37211,37212,37213,
+37214,37215,37216,37217,37218,37219,37220,37221,37222,37223,37224,37225,
+37226,37227,37228,37229,37230,37231,37232,37233,37234,37235,37236,37237,
+37238,37239,37240,37241,37242,37243,37244,37245,37246,37247,37248,37249,
+37250,37251,37252,37253,37254,37255,37256,37257,37258,37259,37260,37261,
+37262,37263,37264,37265,37266,37267,37268,37269,37270,37271,37272,37273,
+37274,37275,37276,37277,37278,37279,37280,37281,37282,37283,37284,37285,
+37286,37287,37288,37289,37290,37291,37292,37293,37294,37295,37296,37297,
+37298,37299,37300,37301,37302,37303,37304,37305,37306,37307,37308,37309,
+37310,37311,37312,37313,37314,37315,37316,37317,37318,37319,37320,37321,
+37322,37323,37324,37325,37326,37327,37328,37329,37330,37331,37332,37333,
+37334,37335,37336,37337,37338,37339,37340,37341,37342,37343,37344,37345,
+37346,37347,37348,37349,37350,37351,37352,37353,37354,37355,37356,37357,
+37358,37359,37360,37361,37362,37363,37364,37365,37366,37367,37368,37369,
+37370,37371,37372,37373,37374,37375,37376,37377,37378,37379,37380,37381,
+37382,37383,37384,37385,37386,37387,37388,37389,37390,37391,37392,37393,
+37394,37395,37396,37397,37398,37399,37400,37401,37402,37403,37404,37405,
+37406,37407,37408,37409,37410,37411,37412,37413,37414,37415,37416,37417,
+37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,37428,37429,
+37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,37441,
+37442,37443,37444,37445,37446,37447,37448,37449,37450,37451,37452,37453,
+37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,37464,37465,
+37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,37477,
+37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,
+37490,37491,37492,37493,37494,37495,37496,37497,37498,37499,37500,37501,
+37502,37503,37504,37505,37506,37507,37508,37509,37510,37511,37512,37513,
+37514,37515,37516,37517,37518,37519,37520,37521,37522,37523,37524,37525,
+37526,37527,37528,37529,37530,37531,37532,37533,37534,37535,37536,37537,
+37538,37539,37540,37541,37542,37543,37544,37545,37546,37547,37548,37549,
+37550,37551,37552,37553,37554,37555,37556,37557,37558,37559,37560,37561,
+37562,37563,37564,37565,37566,37567,37568,37569,37570,37571,37572,37573,
+37574,37575,37576,37577,37578,37579,37580,37581,37582,37583,37584,37585,
+37586,37587,37588,37589,37590,37591,37592,37593,37594,37595,37596,37597,
+37598,37599,37600,37601,37602,37603,37604,37605,37606,37607,37608,37609,
+37610,37611,37612,37613,37614,37615,37616,37617,37618,37619,37620,37621,
+37622,37623,37624,37625,37626,37627,37628,37629,37630,37631,37632,37633,
+37634,37635,37636,37637,37638,37639,37640,37641,37642,37643,37644,37645,
+37646,37647,37648,37649,37650,37651,37652,37653,37654,37655,37656,37657,
+37658,37659,37660,37661,37662,37663,37664,37665,37666,37667,37668,37669,
+37670,37671,37672,37673,37674,37675,37676,37677,37678,37679,37680,37681,
+37682,37683,37684,37685,37686,37687,37688,37689,37690,37691,37692,37693,
+37694,37695,37696,37697,37698,37699,37700,37701,37702,37703,37704,37705,
+37706,37707,37708,37709,37710,37711,37712,37713,37714,37715,37716,37717,
+37718,37719,37720,37721,37722,37723,37724,37725,37726,37727,37728,37729,
+37730,37731,37732,37733,37734,37735,37736,37737,37738,37739,37740,37741,
+37742,37743,37744,37745,37746,37747,37748,37749,37750,37751,37752,37753,
+37754,37755,37756,37757,37758,37759,37760,37761,37762,37763,37764,37765,
+37766,37767,37768,37769,37770,37771,37772,37773,37774,37775,37776,37777,
+37778,37779,37780,37781,37782,37783,37784,37785,37786,37787,37788,37789,
+37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,37800,37801,
+37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,37813,
+37814,37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,
+37826,37827,37828,37829,37830,37831,37832,37833,37834,37835,37836,37837,
+37838,37839,37840,37841,37842,37843,37844,37845,37846,37847,37848,37849,
+37850,37851,37852,37853,37854,37855,37856,37857,37858,37859,37860,37861,
+37862,37863,37864,37865,37866,37867,37868,37869,37870,37871,37872,37873,
+37874,37875,37876,37877,37878,37879,37880,37881,37882,37883,37884,37885,
+37886,37887,37888,37889,37890,37891,37892,37893,37894,37895,37896,37897,
+37898,37899,37900,37901,37902,37903,37904,37905,37906,37907,37908,37909,
+37910,37911,37912,37913,37914,37915,37916,37917,37918,37919,37920,37921,
+37922,37923,37924,37925,37926,37927,37928,37929,37930,37931,37932,37933,
+37934,37935,37936,37937,37938,37939,37940,37941,37942,37943,37944,37945,
+37946,37947,37948,37949,37950,37951,37952,37953,37954,37955,37956,37957,
+37958,37959,37960,37961,37962,37963,37964,37965,37966,37967,37968,37969,
+37970,37971,37972,37973,37974,37975,37976,37977,37978,37979,37980,37981,
+37982,37983,37984,37985,37986,37987,37988,37989,37990,37991,37992,37993,
+37994,37995,37996,37997,37998,37999,38000,38001,38002,38003,38004,38005,
+38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,38017,
+38018,38019,38020,38021,38022,38023,38024,38025,38026,38027,38028,38029,
+38030,38031,38032,38033,38034,38035,38036,38037,38038,38039,38040,38041,
+38042,38043,38044,38045,38046,38047,38048,38049,38050,38051,38052,38053,
+38054,38055,38056,38057,38058,38059,38060,38061,38062,38063,38064,38065,
+38066,38067,38068,38069,38070,38071,38072,38073,38074,38075,38076,38077,
+38078,38079,38080,38081,38082,38083,38084,38085,38086,38087,38088,38089,
+38090,38091,38092,38093,38094,38095,38096,38097,38098,38099,38100,38101,
+38102,38103,38104,38105,38106,38107,38108,38109,38110,38111,38112,38113,
+38114,38115,38116,38117,38118,38119,38120,38121,38122,38123,38124,38125,
+38126,38127,38128,38129,38130,38131,38132,38133,38134,38135,38136,38137,
+38138,38139,38140,38141,38142,38143,38144,38145,38146,38147,38148,38149,
+38150,38151,38152,38153,38154,38155,38156,38157,38158,38159,38160,38161,
+38162,38163,38164,38165,38166,38167,38168,38169,38170,38171,38172,38173,
+38174,38175,38176,38177,38178,38179,38180,38181,38182,38183,38184,38185,
+38186,38187,38188,38189,38190,38191,38192,38193,38194,38195,38196,38197,
+38198,38199,38200,38201,38202,38203,38204,38205,38206,38207,38208,38209,
+38210,38211,38212,38213,38214,38215,38216,38217,38218,38219,38220,38221,
+38222,38223,38224,38225,38226,38227,38228,38229,38230,38231,38232,38233,
+38234,38235,38236,38237,38238,38239,38240,38241,38242,38243,38244,38245,
+38246,38247,38248,38249,38250,38251,38252,38253,38254,38255,38256,38257,
+38258,38259,38260,38261,38262,38263,38264,38265,38266,38267,38268,38269,
+38270,38271,38272,38273,38274,38275,38276,38277,38278,38279,38280,38281,
+38282,38283,38284,38285,38286,38287,38288,38289,38290,38291,38292,38293,
+38294,38295,38296,38297,38298,38299,38300,38301,38302,38303,38304,38305,
+38306,38307,38308,38309,38310,38311,38312,38313,38314,38315,38316,38317,
+38318,38319,38320,38321,38322,38323,38324,38325,38326,38327,38328,38329,
+38330,38331,38332,38333,38334,38335,38336,38337,38338,38339,38340,38341,
+38342,38343,38344,38345,38346,38347,38348,38349,38350,38351,38352,38353,
+38354,38355,38356,38357,38358,38359,38360,38361,38362,38363,38364,38365,
+38366,38367,38368,38369,38370,38371,38372,38373,38374,38375,38376,38377,
+38378,38379,38380,38381,38382,38383,38384,38385,38386,38387,38388,38389,
+38390,38391,38392,38393,38394,38395,38396,38397,38398,38399,38400,38401,
+38402,38403,38404,38405,38406,38407,38408,38409,38410,38411,38412,38413,
+38414,38415,38416,38417,38418,38419,38420,38421,38422,38423,38424,38425,
+38426,38427,38428,38429,38430,38431,38432,38433,38434,38435,38436,38437,
+38438,38439,38440,38441,38442,38443,38444,38445,38446,38447,38448,38449,
+38450,38451,38452,38453,38454,38455,38456,38457,38458,38459,38460,38461,
+38462,38463,38464,38465,38466,38467,38468,38469,38470,38471,38472,38473,
+38474,38475,38476,38477,38478,38479,38480,38481,38482,38483,38484,38485,
+38486,38487,38488,38489,38490,38491,38492,38493,38494,38495,38496,38497,
+38498,38499,38500,38501,38502,38503,38504,38505,38506,38507,38508,38509,
+38510,38511,38512,38513,38514,38515,38516,38517,38518,38519,38520,38521,
+38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,38532,38533,
+38534,38535,38536,38537,38538,38539,38540,38541,38542,38543,38544,38545,
+38546,38547,38548,38549,38550,38551,38552,38553,38554,38555,38556,38557,
+38558,38559,38560,38561,38562,38563,38564,38565,38566,38567,38568,38569,
+38570,38571,38572,38573,38574,38575,38576,38577,38578,38579,38580,38581,
+38582,38583,38584,38585,38586,38587,38588,38589,38590,38591,38592,38593,
+38594,38595,38596,38597,38598,38599,38600,38601,38602,38603,38604,38605,
+38606,38607,38608,38609,38610,38611,38612,38613,38614,38615,38616,38617,
+38618,38619,38620,38621,38622,38623,38624,38625,38626,38627,38628,38629,
+38630,38631,38632,38633,38634,38635,38636,38637,38638,38639,38640,38641,
+38642,38643,38644,38645,38646,38647,38648,38649,38650,38651,38652,38653,
+38654,38655,38656,38657,38658,38659,38660,38661,38662,38663,38664,38665,
+38666,38667,38668,38669,38670,38671,38672,38673,38674,38675,38676,38677,
+38678,38679,38680,38681,38682,38683,38684,38685,38686,38687,38688,38689,
+38690,38691,38692,38693,38694,38695,38696,38697,38698,38699,38700,38701,
+38702,38703,38704,38705,38706,38707,38708,38709,38710,38711,38712,38713,
+38714,38715,38716,38717,38718,38719,38720,38721,38722,38723,38724,38725,
+38726,38727,38728,38729,38730,38731,38732,38733,38734,38735,38736,38737,
+38738,38739,38740,38741,38742,38743,38744,38745,38746,38747,38748,38749,
+38750,38751,38752,38753,38754,38755,38756,38757,38758,38759,38760,38761,
+38762,38763,38764,38765,38766,38767,38768,38769,38770,38771,38772,38773,
+38774,38775,38776,38777,38778,38779,38780,38781,38782,38783,38784,38785,
+38786,38787,38788,38789,38790,38791,38792,38793,38794,38795,38796,38797,
+38798,38799,38800,38801,38802,38803,38804,38805,38806,38807,38808,38809,
+38810,38811,38812,38813,38814,38815,38816,38817,38818,38819,38820,38821,
+38822,38823,38824,38825,38826,38827,38828,38829,38830,38831,38832,38833,
+38834,38835,38836,38837,38838,38839,38840,38841,38842,38843,38844,38845,
+38846,38847,38848,38849,38850,38851,38852,38853,38854,38855,38856,38857,
+38858,38859,38860,38861,38862,38863,38864,38865,38866,38867,38868,38869,
+38870,38871,38872,38873,38874,38875,38876,38877,38878,38879,38880,38881,
+38882,38883,38884,38885,38886,38887,38888,38889,38890,38891,38892,38893,
+38894,38895,38896,38897,38898,38899,38900,38901,38902,38903,38904,38905,
+38906,38907,38908,38909,38910,38911,38912,38913,38914,38915,38916,38917,
+38918,38919,38920,38921,38922,38923,38924,38925,38926,38927,38928,38929,
+38930,38931,38932,38933,38934,38935,38936,38937,38938,38939,38940,38941,
+38942,38943,38944,38945,38946,38947,38948,38949,38950,38951,38952,38953,
+38954,38955,38956,38957,38958,38959,38960,38961,38962,38963,38964,38965,
+38966,38967,38968,38969,38970,38971,38972,38973,38974,38975,38976,38977,
+38978,38979,38980,38981,38982,38983,38984,38985,38986,38987,38988,38989,
+38990,38991,38992,38993,38994,38995,38996,38997,38998,38999,39000,39001,
+39002,39003,39004,39005,39006,39007,39008,39009,39010,39011,39012,39013,
+39014,39015,39016,39017,39018,39019,39020,39021,39022,39023,39024,39025,
+39026,39027,39028,39029,39030,39031,39032,39033,39034,39035,39036,39037,
+39038,39039,39040,39041,39042,39043,39044,39045,39046,39047,39048,39049,
+39050,39051,39052,39053,39054,39055,39056,39057,39058,39059,39060,39061,
+39062,39063,39064,39065,39066,39067,39068,39069,39070,39071,39072,39073,
+39074,39075,39076,39077,39078,39079,39080,39081,39082,39083,39084,39085,
+39086,39087,39088,39089,39090,39091,39092,39093,39094,39095,39096,39097,
+39098,39099,39100,39101,39102,39103,39104,39105,39106,39107,39108,39109,
+39110,39111,39112,39113,39114,39115,39116,39117,39118,39119,39120,39121,
+39122,39123,39124,39125,39126,39127,39128,39129,39130,39131,39132,39133,
+39134,39135,39136,39137,39138,39139,39140,39141,39142,39143,39144,39145,
+39146,39147,39148,39149,39150,39151,39152,39153,39154,39155,39156,39157,
+39158,39159,39160,39161,39162,39163,39164,39165,39166,39167,39168,39169,
+39170,39171,39172,39173,39174,39175,39176,39177,39178,39179,39180,39181,
+39182,39183,39184,39185,39186,39187,39188,39189,39190,39191,39192,39193,
+39194,39195,39196,39197,39198,39199,39200,39201,39202,39203,39204,39205,
+39206,39207,39208,39209,39210,39211,39212,39213,39214,39215,39216,39217,
+39218,39219,39220,39221,39222,39223,39224,39225,39226,39227,39228,39229,
+39230,39231,39232,39233,39234,39235,39236,39237,39238,39239,39240,39241,
+39242,39243,39244,39245,39246,39247,39248,39249,39250,39251,39252,39253,
+39254,39255,39256,39257,39258,39259,39260,39261,39262,39263,39264,39265,
+39266,39267,39268,39269,39270,39271,39272,39273,39274,39275,39276,39277,
+39278,39279,39280,39281,39282,39283,39284,39285,39286,39287,39288,39289,
+39290,39291,39292,39293,39294,39295,39296,39297,39298,39299,39300,39301,
+39302,39303,39304,39305,39306,39307,39308,39309,39310,39311,39312,39313,
+39314,39315,39316,39317,39318,39319,39320,39321,39322,39323,39324,39325,
+39326,39327,39328,39329,39330,39331,39332,39333,39334,39335,39336,39337,
+39338,39339,39340,39341,39342,39343,39344,39345,39346,39347,39348,39349,
+39350,39351,39352,39353,39354,39355,39356,39357,39358,39359,39360,39361,
+39362,39363,39364,39365,39366,39367,39368,39369,39370,39371,39372,39373,
+39374,39375,39376,39377,39378,39379,39380,39381,39382,39383,39384,39385,
+39386,39387,39388,39389,39390,39391,39392,39393,39394,39395,39396,39397,
+39398,39399,39400,39401,39402,39403,39404,39405,39406,39407,39408,39409,
+39410,39411,39412,39413,39414,39415,39416,39417,39418,39419,39420,39421,
+39422,39423,39424,39425,39426,39427,39428,39429,39430,39431,39432,39433,
+39434,39435,39436,39437,39438,39439,39440,39441,39442,39443,39444,39445,
+39446,39447,39448,39449,39450,39451,39452,39453,39454,39455,39456,39457,
+39458,39459,39460,39461,39462,39463,39464,39465,39466,39467,39468,39469,
+39470,39471,39472,39473,39474,39475,39476,39477,39478,39479,39480,39481,
+39482,39483,39484,39485,39486,39487,39488,39489,39490,39491,39492,39493,
+39494,39495,39496,39497,39498,39499,39500,39501,39502,39503,39504,39505,
+39506,39507,39508,39509,39510,39511,39512,39513,39514,39515,39516,39517,
+39518,39519,39520,39521,39522,39523,39524,39525,39526,39527,39528,39529,
+39530,39531,39532,39533,39534,39535,39536,39537,39538,39539,39540,39541,
+39542,39543,39544,39545,39546,39547,39548,39549,39550,39551,39552,39553,
+39554,39555,39556,39557,39558,39559,39560,39561,39562,39563,39564,39565,
+39566,39567,39568,39569,39570,39571,39572,39573,39574,39575,39576,39577,
+39578,39579,39580,39581,39582,39583,39584,39585,39586,39587,39588,39589,
+39590,39591,39592,39593,39594,39595,39596,39597,39598,39599,39600,39601,
+39602,39603,39604,39605,39606,39607,39608,39609,39610,39611,39612,39613,
+39614,39615,39616,39617,39618,39619,39620,39621,39622,39623,39624,39625,
+39626,39627,39628,39629,39630,39631,39632,39633,39634,39635,39636,39637,
+39638,39639,39640,39641,39642,39643,39644,39645,39646,39647,39648,39649,
+39650,39651,39652,39653,39654,39655,39656,39657,39658,39659,39660,39661,
+39662,39663,39664,39665,39666,39667,39668,39669,39670,39671,39672,39673,
+39674,39675,39676,39677,39678,39679,39680,39681,39682,39683,39684,39685,
+39686,39687,39688,39689,39690,39691,39692,39693,39694,39695,39696,39697,
+39698,39699,39700,39701,39702,39703,39704,39705,39706,39707,39708,39709,
+39710,39711,39712,39713,39714,39715,39716,39717,39718,39719,39720,39721,
+39722,39723,39724,39725,39726,39727,39728,39729,39730,39731,39732,39733,
+39734,39735,39736,39737,39738,39739,39740,39741,39742,39743,39744,39745,
+39746,39747,39748,39749,39750,39751,39752,39753,39754,39755,39756,39757,
+39758,39759,39760,39761,39762,39763,39764,39765,39766,39767,39768,39769,
+39770,39771,39772,39773,39774,39775,39776,39777,39778,39779,39780,39781,
+39782,39783,39784,39785,39786,39787,39788,39789,39790,39791,39792,39793,
+39794,39795,39796,39797,39798,39799,39800,39801,39802,39803,39804,39805,
+39806,39807,39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,
+39818,39819,39820,39821,39822,39823,39824,39825,39826,39827,39828,39829,
+39830,39831,39832,39833,39834,39835,39836,39837,39838,39839,39840,39841,
+39842,39843,39844,39845,39846,39847,39848,39849,39850,39851,39852,39853,
+39854,39855,39856,39857,39858,39859,39860,39861,39862,39863,39864,39865,
+39866,39867,39868,39869,39870,39871,39872,39873,39874,39875,39876,39877,
+39878,39879,39880,39881,39882,39883,39884,39885,39886,39887,39888,39889,
+39890,39891,39892,39893,39894,39895,39896,39897,39898,39899,39900,39901,
+39902,39903,39904,39905,39906,39907,39908,39909,39910,39911,39912,39913,
+39914,39915,39916,39917,39918,39919,39920,39921,39922,39923,39924,39925,
+39926,39927,39928,39929,39930,39931,39932,39933,39934,39935,39936,39937,
+39938,39939,39940,39941,39942,39943,39944,39945,39946,39947,39948,39949,
+39950,39951,39952,39953,39954,39955,39956,39957,39958,39959,39960,39961,
+39962,39963,39964,39965,39966,39967,39968,39969,39970,39971,39972,39973,
+39974,39975,39976,39977,39978,39979,39980,39981,39982,39983,39984,39985,
+39986,39987,39988,39989,39990,39991,39992,39993,39994,39995,39996,39997,
+39998,39999,40000,40001,40002,40003,40004,40005,40006,40007,40008,40009,
+40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,
+40022,40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,
+40034,40035,40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,
+40046,40047,40048,40049,40050,40051,40052,40053,40054,40055,40056,40057,
+40058,40059,40060,40061,40062,40063,40064,40065,40066,40067,40068,40069,
+40070,40071,40072,40073,40074,40075,40076,40077,40078,40079,40080,40081,
+40082,40083,40084,40085,40086,40087,40088,40089,40090,40091,40092,40093,
+40094,40095,40096,40097,40098,40099,40100,40101,40102,40103,40104,40105,
+40106,40107,40108,40109,40110,40111,40112,40113,40114,40115,40116,40117,
+40118,40119,40120,40121,40122,40123,40124,40125,40126,40127,40128,40129,
+40130,40131,40132,40133,40134,40135,40136,40137,40138,40139,40140,40141,
+40142,40143,40144,40145,40146,40147,40148,40149,40150,40151,40152,40153,
+40154,40155,40156,40157,40158,40159,40160,40161,40162,40163,40164,40165,
+40166,40167,40168,40169,40170,40171,40172,40173,40174,40175,40176,40177,
+40178,40179,40180,40181,40182,40183,40184,40185,40186,40187,40188,40189,
+40190,40191,40192,40193,40194,40195,40196,40197,40198,40199,40200,40201,
+40202,40203,40204,40205,40206,40207,40208,40209,40210,40211,40212,40213,
+40214,40215,40216,40217,40218,40219,40220,40221,40222,40223,40224,40225,
+40226,40227,40228,40229,40230,40231,40232,40233,40234,40235,40236,40237,
+40238,40239,40240,40241,40242,40243,40244,40245,40246,40247,40248,40249,
+40250,40251,40252,40253,40254,40255,40256,40257,40258,40259,40260,40261,
+40262,40263,40264,40265,40266,40267,40268,40269,40270,40271,40272,40273,
+40274,40275,40276,40277,40278,40279,40280,40281,40282,40283,40284,40285,
+40286,40287,40288,40289,40290,40291,40292,40293,40294,40295,40296,40297,
+40298,40299,40300,40301,40302,40303,40304,40305,40306,40307,40308,40309,
+40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,40320,40321,
+40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,40333,
+40334,40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,
+40346,40347,40348,40349,40350,40351,40352,40353,40354,40355,40356,40357,
+40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,40369,
+40370,40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,
+40382,40383,40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,
+40394,40395,40396,40397,40398,40399,40400,40401,40402,40403,40404,40405,
+40406,40407,40408,40409,40410,40411,40412,40413,40414,40415,40416,40417,
+40418,40419,40420,40421,40422,40423,40424,40425,40426,40427,40428,40429,
+40430,40431,40432,40433,40434,40435,40436,40437,40438,40439,40440,40441,
+40442,40443,40444,40445,40446,40447,40448,40449,40450,40451,40452,40453,
+40454,40455,40456,40457,40458,40459,40460,40461,40462,40463,40464,40465,
+40466,40467,40468,40469,40470,40471,40472,40473,40474,40475,40476,40477,
+40478,40479,40480,40481,40482,40483,40484,40485,40486,40487,40488,40489,
+40490,40491,40492,40493,40494,40495,40496,40497,40498,40499,40500,40501,
+40502,40503,40504,40505,40506,40507,40508,40509,40510,40511,40512,40513,
+40514,40515,40516,40517,40518,40519,40520,40521,40522,40523,40524,40525,
+40526,40527,40528,40529,40530,40531,40532,40533,40534,40535,40536,40537,
+40538,40539,40540,40541,40542,40543,40544,40545,40546,40547,40548,40549,
+40550,40551,40552,40553,40554,40555,40556,40557,40558,40559,40560,40561,
+40562,40563,40564,40565,40566,40567,40568,40569,40570,40571,40572,40573,
+40574,40575,40576,40577,40578,40579,40580,40581,40582,40583,40584,40585,
+40586,40587,40588,40589,40590,40591,40592,40593,40594,40595,40596,40597,
+40598,40599,40600,40601,40602,40603,40604,40605,40606,40607,40608,40609,
+40610,40611,40612,40613,40614,40615,40616,40617,40618,40619,40620,40621,
+40622,40623,40624,40625,40626,40627,40628,40629,40630,40631,40632,40633,
+40634,40635,40636,40637,40638,40639,40640,40641,40642,40643,40644,40645,
+40646,40647,40648,40649,40650,40651,40652,40653,40654,40655,40656,40657,
+40658,40659,40660,40661,40662,40663,40664,40665,40666,40667,40668,40669,
+40670,40671,40672,40673,40674,40675,40676,40677,40678,40679,40680,40681,
+40682,40683,40684,40685,40686,40687,40688,40689,40690,40691,40692,40693,
+40694,40695,40696,40697,40698,40699,40700,40701,40702,40703,40704,40705,
+40706,40707,40708,40709,40710,40711,40712,40713,40714,40715,40716,40717,
+40718,40719,40720,40721,40722,40723,40724,40725,40726,40727,40728,40729,
+40730,40731,40732,40733,40734,40735,40736,40737,40738,40739,40740,40741,
+40742,40743,40744,40745,40746,40747,40748,40749,40750,40751,40752,40753,
+40754,40755,40756,40757,40758,40759,40760,40761,40762,40763,40764,40765,
+40766,40767,40768,40769,40770,40771,40772,40773,40774,40775,40776,40777,
+40778,40779,40780,40781,40782,40783,40784,40785,40786,40787,40788,40789,
+40790,40791,40792,40793,40794,40795,40796,40797,40798,40799,40800,40801,
+40802,40803,40804,40805,40806,40807,40808,40809,40810,40811,40812,40813,
+40814,40815,40816,40817,40818,40819,40820,40821,40822,40823,40824,40825,
+40826,40827,40828,40829,40830,40831,40832,40833,40834,40835,40836,40837,
+40838,40839,40840,40841,40842,40843,40844,40845,40846,40847,40848,40849,
+40850,40851,40852,40853,40854,40855,40856,40857,40858,40859,40860,40861,
+40862,40863,40864,40865,40866,40867,40868,40869,40870,40871,40872,40873,
+40874,40875,40876,40877,40878,40879,40880,40881,40882,40883,40884,40885,
+40886,40887,40888,40889,40890,40891,40892,40893,40894,40895,40896,40897,
+40898,40899,40900,40901,40902,40903,40904,40905,40906,40907,40908,40909,
+40910,40911,40912,40913,40914,40915,40916,40917,40918,40919,40920,40921,
+40922,40923,40924,40925,40926,40927,40928,40929,40930,40931,40932,40933,
+40934,40935,40936,40937,40938,40939,40940,40941,40942,40943,40944,40945,
+40946,40947,40948,40949,40950,40951,40952,40953,40954,40955,40956,40957,
+40958,40959,40960,40961,40962,40963,40964,40965,40966,40967,40968,40969,
+40970,40971,40972,40973,40974,40975,40976,40977,40978,40979,40980,40981,
+40982,40983,40984,40985,40986,40987,40988,40989,40990,40991,40992,40993,
+40994,40995,40996,40997,40998,40999,41000,41001,41002,41003,41004,41005,
+41006,41007,41008,41009,41010,41011,41012,41013,41014,41015,41016,41017,
+41018,41019,41020,41021,41022,41023,41024,41025,41026,41027,41028,41029,
+41030,41031,41032,41033,41034,41035,41036,41037,41038,41039,41040,41041,
+41042,41043,41044,41045,41046,41047,41048,41049,41050,41051,41052,41053,
+41054,41055,41056,41057,41058,41059,41060,41061,41062,41063,41064,41065,
+41066,41067,41068,41069,41070,41071,41072,41073,41074,41075,41076,41077,
+41078,41079,41080,41081,41082,41083,41084,41085,41086,41087,41088,41089,
+41090,41091,41092,41093,41094,41095,41096,41097,41098,41099,41100,41101,
+41102,41103,41104,41105,41106,41107,41108,41109,41110,41111,41112,41113,
+41114,41115,41116,41117,41118,41119,41120,41121,41122,41123,41124,41125,
+41126,41127,41128,41129,41130,41131,41132,41133,41134,41135,41136,41137,
+41138,41139,41140,41141,41142,41143,41144,41145,41146,41147,41148,41149,
+41150,41151,41152,41153,41154,41155,41156,41157,41158,41159,41160,41161,
+41162,41163,41164,41165,41166,41167,41168,41169,41170,41171,41172,41173,
+41174,41175,41176,41177,41178,41179,41180,41181,41182,41183,41184,41185,
+41186,41187,41188,41189,41190,41191,41192,41193,41194,41195,41196,41197,
+41198,41199,41200,41201,41202,41203,41204,41205,41206,41207,41208,41209,
+41210,41211,41212,41213,41214,41215,41216,41217,41218,41219,41220,41221,
+41222,41223,41224,41225,41226,41227,41228,41229,41230,41231,41232,41233,
+41234,41235,41236,41237,41238,41239,41240,41241,41242,41243,41244,41245,
+41246,41247,41248,41249,41250,41251,41252,41253,41254,41255,41256,41257,
+41258,41259,41260,41261,41262,41263,41264,41265,41266,41267,41268,41269,
+41270,41271,41272,41273,41274,41275,41276,41277,41278,41279,41280,41281,
+41282,41283,41284,41285,41286,41287,41288,41289,41290,41291,41292,41293,
+41294,41295,41296,41297,41298,41299,41300,41301,41302,41303,41304,41305,
+41306,41307,41308,41309,41310,41311,41312,41313,41314,41315,41316,41317,
+41318,41319,41320,41321,41322,41323,41324,41325,41326,41327,41328,41329,
+41330,41331,41332,41333,41334,41335,41336,41337,41338,41339,41340,41341,
+41342,41343,41344,41345,41346,41347,41348,41349,41350,41351,41352,41353,
+41354,41355,41356,41357,41358,41359,41360,41361,41362,41363,41364,41365,
+41366,41367,41368,41369,41370,41371,41372,41373,41374,41375,41376,41377,
+41378,41379,41380,41381,41382,41383,41384,41385,41386,41387,41388,41389,
+41390,41391,41392,41393,41394,41395,41396,41397,41398,41399,41400,41401,
+41402,41403,41404,41405,41406,41407,41408,41409,41410,41411,41412,41413,
+41414,41415,41416,41417,41418,41419,41420,41421,41422,41423,41424,41425,
+41426,41427,41428,41429,41430,41431,41432,41433,41434,41435,41436,41437,
+41438,41439,41440,41441,41442,41443,41444,41445,41446,41447,41448,41449,
+41450,41451,41452,41453,41454,41455,41456,41457,41458,41459,41460,41461,
+41462,41463,41464,41465,41466,41467,41468,41469,41470,41471,41472,41473,
+41474,41475,41476,41477,41478,41479,41480,41481,41482,41483,41484,41485,
+41486,41487,41488,41489,41490,41491,41492,41493,41494,41495,41496,41497,
+41498,41499,41500,41501,41502,41503,41504,41505,41506,41507,41508,41509,
+41510,41511,41512,41513,41514,41515,41516,41517,41518,41519,41520,41521,
+41522,41523,41524,41525,41526,41527,41528,41529,41530,41531,41532,41533,
+41534,41535,41536,41537,41538,41539,41540,41541,41542,41543,41544,41545,
+41546,41547,41548,41549,41550,41551,41552,41553,41554,41555,41556,41557,
+41558,41559,41560,41561,41562,41563,41564,41565,41566,41567,41568,41569,
+41570,41571,41572,41573,41574,41575,41576,41577,41578,41579,41580,41581,
+41582,41583,41584,41585,41586,41587,41588,41589,41590,41591,41592,41593,
+41594,41595,41596,41597,41598,41599,41600,41601,41602,41603,41604,41605,
+41606,41607,41608,41609,41610,41611,41612,41613,41614,41615,41616,41617,
+41618,41619,41620,41621,41622,41623,41624,41625,41626,41627,41628,41629,
+41630,41631,41632,41633,41634,41635,41636,41637,41638,41639,41640,41641,
+41642,41643,41644,41645,41646,41647,41648,41649,41650,41651,41652,41653,
+41654,41655,41656,41657,41658,41659,41660,41661,41662,41663,41664,41665,
+41666,41667,41668,41669,41670,41671,41672,41673,41674,41675,41676,41677,
+41678,41679,41680,41681,41682,41683,41684,41685,41686,41687,41688,41689,
+41690,41691,41692,41693,41694,41695,41696,41697,41698,41699,41700,41701,
+41702,41703,41704,41705,41706,41707,41708,41709,41710,41711,41712,41713,
+41714,41715,41716,41717,41718,41719,41720,41721,41722,41723,41724,41725,
+41726,41727,41728,41729,41730,41731,41732,41733,41734,41735,41736,41737,
+41738,41739,41740,41741,41742,41743,41744,41745,41746,41747,41748,41749,
+41750,41751,41752,41753,41754,41755,41756,41757,41758,41759,41760,41761,
+41762,41763,41764,41765,41766,41767,41768,41769,41770,41771,41772,41773,
+41774,41775,41776,41777,41778,41779,41780,41781,41782,41783,41784,41785,
+41786,41787,41788,41789,41790,41791,41792,41793,41794,41795,41796,41797,
+41798,41799,41800,41801,41802,41803,41804,41805,41806,41807,41808,41809,
+41810,41811,41812,41813,41814,41815,41816,41817,41818,41819,41820,41821,
+41822,41823,41824,41825,41826,41827,41828,41829,41830,41831,41832,41833,
+41834,41835,41836,41837,41838,41839,41840,41841,41842,41843,41844,41845,
+41846,41847,41848,41849,41850,41851,41852,41853,41854,41855,41856,41857,
+41858,41859,41860,41861,41862,41863,41864,41865,41866,41867,41868,41869,
+41870,41871,41872,41873,41874,41875,41876,41877,41878,41879,41880,41881,
+41882,41883,41884,41885,41886,41887,41888,41889,41890,41891,41892,41893,
+41894,41895,41896,41897,41898,41899,41900,41901,41902,41903,41904,41905,
+41906,41907,41908,41909,41910,41911,41912,41913,41914,41915,41916,41917,
+41918,41919,41920,41921,41922,41923,41924,41925,41926,41927,41928,41929,
+41930,41931,41932,41933,41934,41935,41936,41937,41938,41939,41940,41941,
+41942,41943,41944,41945,41946,41947,41948,41949,41950,41951,41952,41953,
+41954,41955,41956,41957,41958,41959,41960,41961,41962,41963,41964,41965,
+41966,41967,41968,41969,41970,41971,41972,41973,41974,41975,41976,41977,
+41978,41979,41980,41981,41982,41983,41984,41985,41986,41987,41988,41989,
+41990,41991,41992,41993,41994,41995,41996,41997,41998,41999,42000,42001,
+42002,42003,42004,42005,42006,42007,42008,42009,42010,42011,42012,42013,
+42014,42015,42016,42017,42018,42019,42020,42021,42022,42023,42024,42025,
+42026,42027,42028,42029,42030,42031,42032,42033,42034,42035,42036,42037,
+42038,42039,42040,42041,42042,42043,42044,42045,42046,42047,42048,42049,
+42050,42051,42052,42053,42054,42055,42056,42057,42058,42059,42060,42061,
+42062,42063,42064,42065,42066,42067,42068,42069,42070,42071,42072,42073,
+42074,42075,42076,42077,42078,42079,42080,42081,42082,42083,42084,42085,
+42086,42087,42088,42089,42090,42091,42092,42093,42094,42095,42096,42097,
+42098,42099,42100,42101,42102,42103,42104,42105,42106,42107,42108,42109,
+42110,42111,42112,42113,42114,42115,42116,42117,42118,42119,42120,42121,
+42122,42123,42124,42125,42126,42127,42128,42129,42130,42131,42132,42133,
+42134,42135,42136,42137,42138,42139,42140,42141,42142,42143,42144,42145,
+42146,42147,42148,42149,42150,42151,42152,42153,42154,42155,42156,42157,
+42158,42159,42160,42161,42162,42163,42164,42165,42166,42167,42168,42169,
+42170,42171,42172,42173,42174,42175,42176,42177,42178,42179,42180,42181,
+42182,42183,42184,42185,42186,42187,42188,42189,42190,42191,42192,42193,
+42194,42195,42196,42197,42198,42199,42200,42201,42202,42203,42204,42205,
+42206,42207,42208,42209,42210,42211,42212,42213,42214,42215,42216,42217,
+42218,42219,42220,42221,42222,42223,42224,42225,42226,42227,42228,42229,
+42230,42231,42232,42233,42234,42235,42236,42237,42238,42239,42240,42241,
+42242,42243,42244,42245,42246,42247,42248,42249,42250,42251,42252,42253,
+42254,42255,42256,42257,42258,42259,42260,42261,42262,42263,42264,42265,
+42266,42267,42268,42269,42270,42271,42272,42273,42274,42275,42276,42277,
+42278,42279,42280,42281,42282,42283,42284,42285,42286,42287,42288,42289,
+42290,42291,42292,42293,42294,42295,42296,42297,42298,42299,42300,42301,
+42302,42303,42304,42305,42306,42307,42308,42309,42310,42311,42312,42313,
+42314,42315,42316,42317,42318,42319,42320,42321,42322,42323,42324,42325,
+42326,42327,42328,42329,42330,42331,42332,42333,42334,42335,42336,42337,
+42338,42339,42340,42341,42342,42343,42344,42345,42346,42347,42348,42349,
+42350,42351,42352,42353,42354,42355,42356,42357,42358,42359,42360,42361,
+42362,42363,42364,42365,42366,42367,42368,42369,42370,42371,42372,42373,
+42374,42375,42376,42377,42378,42379,42380,42381,42382,42383,42384,42385,
+42386,42387,42388,42389,42390,42391,42392,42393,42394,42395,42396,42397,
+42398,42399,42400,42401,42402,42403,42404,42405,42406,42407,42408,42409,
+42410,42411,42412,42413,42414,42415,42416,42417,42418,42419,42420,42421,
+42422,42423,42424,42425,42426,42427,42428,42429,42430,42431,42432,42433,
+42434,42435,42436,42437,42438,42439,42440,42441,42442,42443,42444,42445,
+42446,42447,42448,42449,42450,42451,42452,42453,42454,42455,42456,42457,
+42458,42459,42460,42461,42462,42463,42464,42465,42466,42467,42468,42469,
+42470,42471,42472,42473,42474,42475,42476,42477,42478,42479,42480,42481,
+42482,42483,42484,42485,42486,42487,42488,42489,42490,42491,42492,42493,
+42494,42495,42496,42497,42498,42499,42500,42501,42502,42503,42504,42505,
+42506,42507,42508,42509,42510,42511,42512,42513,42514,42515,42516,42517,
+42518,42519,42520,42521,42522,42523,42524,42525,42526,42527,42528,42529,
+42530,42531,42532,42533,42534,42535,42536,42537,42538,42539,42540,42541,
+42542,42543,42544,42545,42546,42547,42548,42549,42550,42551,42552,42553,
+42554,42555,42556,42557,42558,42559,42560,42560,42562,42562,42564,42564,
+42566,42566,42568,42568,42570,42570,42572,42572,42574,42574,42576,42576,
+42578,42578,42580,42580,42582,42582,42584,42584,42586,42586,42588,42588,
+42590,42590,42592,42592,42594,42594,42596,42596,42598,42598,42600,42600,
+42602,42602,42604,42604,42606,42607,42608,42609,42610,42611,42612,42613,
+42614,42615,42616,42617,42618,42619,42620,42621,42622,42623,42624,42624,
+42626,42626,42628,42628,42630,42630,42632,42632,42634,42634,42636,42636,
+42638,42638,42640,42640,42642,42642,42644,42644,42646,42646,42648,42649,
+42650,42651,42652,42653,42654,42655,42656,42657,42658,42659,42660,42661,
+42662,42663,42664,42665,42666,42667,42668,42669,42670,42671,42672,42673,
+42674,42675,42676,42677,42678,42679,42680,42681,42682,42683,42684,42685,
+42686,42687,42688,42689,42690,42691,42692,42693,42694,42695,42696,42697,
+42698,42699,42700,42701,42702,42703,42704,42705,42706,42707,42708,42709,
+42710,42711,42712,42713,42714,42715,42716,42717,42718,42719,42720,42721,
+42722,42723,42724,42725,42726,42727,42728,42729,42730,42731,42732,42733,
+42734,42735,42736,42737,42738,42739,42740,42741,42742,42743,42744,42745,
+42746,42747,42748,42749,42750,42751,42752,42753,42754,42755,42756,42757,
+42758,42759,42760,42761,42762,42763,42764,42765,42766,42767,42768,42769,
+42770,42771,42772,42773,42774,42775,42776,42777,42778,42779,42780,42781,
+42782,42783,42784,42785,42786,42786,42788,42788,42790,42790,42792,42792,
+42794,42794,42796,42796,42798,42798,42800,42801,42802,42802,42804,42804,
+42806,42806,42808,42808,42810,42810,42812,42812,42814,42814,42816,42816,
+42818,42818,42820,42820,42822,42822,42824,42824,42826,42826,42828,42828,
+42830,42830,42832,42832,42834,42834,42836,42836,42838,42838,42840,42840,
+42842,42842,42844,42844,42846,42846,42848,42848,42850,42850,42852,42852,
+42854,42854,42856,42856,42858,42858,42860,42860,42862,42862,42864,42865,
+42866,42867,42868,42869,42870,42871,42872,42873,42873,42875,42875,42877,
+42878,42878,42880,42880,42882,42882,42884,42884,42886,42886,42888,42889,
+42890,42891,42891,42893,42894,42895,42896,42896,42898,42899,42900,42901,
+42902,42903,42904,42905,42906,42907,42908,42909,42910,42911,42912,42912,
+42914,42914,42916,42916,42918,42918,42920,42920,42922,42923,42924,42925,
+42926,42927,42928,42929,42930,42931,42932,42933,42934,42935,42936,42937,
+42938,42939,42940,42941,42942,42943,42944,42945,42946,42947,42948,42949,
+42950,42951,42952,42953,42954,42955,42956,42957,42958,42959,42960,42961,
+42962,42963,42964,42965,42966,42967,42968,42969,42970,42971,42972,42973,
+42974,42975,42976,42977,42978,42979,42980,42981,42982,42983,42984,42985,
+42986,42987,42988,42989,42990,42991,42992,42993,42994,42995,42996,42997,
+42998,42999,43000,43001,43002,43003,43004,43005,43006,43007,43008,43009,
+43010,43011,43012,43013,43014,43015,43016,43017,43018,43019,43020,43021,
+43022,43023,43024,43025,43026,43027,43028,43029,43030,43031,43032,43033,
+43034,43035,43036,43037,43038,43039,43040,43041,43042,43043,43044,43045,
+43046,43047,43048,43049,43050,43051,43052,43053,43054,43055,43056,43057,
+43058,43059,43060,43061,43062,43063,43064,43065,43066,43067,43068,43069,
+43070,43071,43072,43073,43074,43075,43076,43077,43078,43079,43080,43081,
+43082,43083,43084,43085,43086,43087,43088,43089,43090,43091,43092,43093,
+43094,43095,43096,43097,43098,43099,43100,43101,43102,43103,43104,43105,
+43106,43107,43108,43109,43110,43111,43112,43113,43114,43115,43116,43117,
+43118,43119,43120,43121,43122,43123,43124,43125,43126,43127,43128,43129,
+43130,43131,43132,43133,43134,43135,43136,43137,43138,43139,43140,43141,
+43142,43143,43144,43145,43146,43147,43148,43149,43150,43151,43152,43153,
+43154,43155,43156,43157,43158,43159,43160,43161,43162,43163,43164,43165,
+43166,43167,43168,43169,43170,43171,43172,43173,43174,43175,43176,43177,
+43178,43179,43180,43181,43182,43183,43184,43185,43186,43187,43188,43189,
+43190,43191,43192,43193,43194,43195,43196,43197,43198,43199,43200,43201,
+43202,43203,43204,43205,43206,43207,43208,43209,43210,43211,43212,43213,
+43214,43215,43216,43217,43218,43219,43220,43221,43222,43223,43224,43225,
+43226,43227,43228,43229,43230,43231,43232,43233,43234,43235,43236,43237,
+43238,43239,43240,43241,43242,43243,43244,43245,43246,43247,43248,43249,
+43250,43251,43252,43253,43254,43255,43256,43257,43258,43259,43260,43261,
+43262,43263,43264,43265,43266,43267,43268,43269,43270,43271,43272,43273,
+43274,43275,43276,43277,43278,43279,43280,43281,43282,43283,43284,43285,
+43286,43287,43288,43289,43290,43291,43292,43293,43294,43295,43296,43297,
+43298,43299,43300,43301,43302,43303,43304,43305,43306,43307,43308,43309,
+43310,43311,43312,43313,43314,43315,43316,43317,43318,43319,43320,43321,
+43322,43323,43324,43325,43326,43327,43328,43329,43330,43331,43332,43333,
+43334,43335,43336,43337,43338,43339,43340,43341,43342,43343,43344,43345,
+43346,43347,43348,43349,43350,43351,43352,43353,43354,43355,43356,43357,
+43358,43359,43360,43361,43362,43363,43364,43365,43366,43367,43368,43369,
+43370,43371,43372,43373,43374,43375,43376,43377,43378,43379,43380,43381,
+43382,43383,43384,43385,43386,43387,43388,43389,43390,43391,43392,43393,
+43394,43395,43396,43397,43398,43399,43400,43401,43402,43403,43404,43405,
+43406,43407,43408,43409,43410,43411,43412,43413,43414,43415,43416,43417,
+43418,43419,43420,43421,43422,43423,43424,43425,43426,43427,43428,43429,
+43430,43431,43432,43433,43434,43435,43436,43437,43438,43439,43440,43441,
+43442,43443,43444,43445,43446,43447,43448,43449,43450,43451,43452,43453,
+43454,43455,43456,43457,43458,43459,43460,43461,43462,43463,43464,43465,
+43466,43467,43468,43469,43470,43471,43472,43473,43474,43475,43476,43477,
+43478,43479,43480,43481,43482,43483,43484,43485,43486,43487,43488,43489,
+43490,43491,43492,43493,43494,43495,43496,43497,43498,43499,43500,43501,
+43502,43503,43504,43505,43506,43507,43508,43509,43510,43511,43512,43513,
+43514,43515,43516,43517,43518,43519,43520,43521,43522,43523,43524,43525,
+43526,43527,43528,43529,43530,43531,43532,43533,43534,43535,43536,43537,
+43538,43539,43540,43541,43542,43543,43544,43545,43546,43547,43548,43549,
+43550,43551,43552,43553,43554,43555,43556,43557,43558,43559,43560,43561,
+43562,43563,43564,43565,43566,43567,43568,43569,43570,43571,43572,43573,
+43574,43575,43576,43577,43578,43579,43580,43581,43582,43583,43584,43585,
+43586,43587,43588,43589,43590,43591,43592,43593,43594,43595,43596,43597,
+43598,43599,43600,43601,43602,43603,43604,43605,43606,43607,43608,43609,
+43610,43611,43612,43613,43614,43615,43616,43617,43618,43619,43620,43621,
+43622,43623,43624,43625,43626,43627,43628,43629,43630,43631,43632,43633,
+43634,43635,43636,43637,43638,43639,43640,43641,43642,43643,43644,43645,
+43646,43647,43648,43649,43650,43651,43652,43653,43654,43655,43656,43657,
+43658,43659,43660,43661,43662,43663,43664,43665,43666,43667,43668,43669,
+43670,43671,43672,43673,43674,43675,43676,43677,43678,43679,43680,43681,
+43682,43683,43684,43685,43686,43687,43688,43689,43690,43691,43692,43693,
+43694,43695,43696,43697,43698,43699,43700,43701,43702,43703,43704,43705,
+43706,43707,43708,43709,43710,43711,43712,43713,43714,43715,43716,43717,
+43718,43719,43720,43721,43722,43723,43724,43725,43726,43727,43728,43729,
+43730,43731,43732,43733,43734,43735,43736,43737,43738,43739,43740,43741,
+43742,43743,43744,43745,43746,43747,43748,43749,43750,43751,43752,43753,
+43754,43755,43756,43757,43758,43759,43760,43761,43762,43763,43764,43765,
+43766,43767,43768,43769,43770,43771,43772,43773,43774,43775,43776,43777,
+43778,43779,43780,43781,43782,43783,43784,43785,43786,43787,43788,43789,
+43790,43791,43792,43793,43794,43795,43796,43797,43798,43799,43800,43801,
+43802,43803,43804,43805,43806,43807,43808,43809,43810,43811,43812,43813,
+43814,43815,43816,43817,43818,43819,43820,43821,43822,43823,43824,43825,
+43826,43827,43828,43829,43830,43831,43832,43833,43834,43835,43836,43837,
+43838,43839,43840,43841,43842,43843,43844,43845,43846,43847,43848,43849,
+43850,43851,43852,43853,43854,43855,43856,43857,43858,43859,43860,43861,
+43862,43863,43864,43865,43866,43867,43868,43869,43870,43871,43872,43873,
+43874,43875,43876,43877,43878,43879,43880,43881,43882,43883,43884,43885,
+43886,43887,43888,43889,43890,43891,43892,43893,43894,43895,43896,43897,
+43898,43899,43900,43901,43902,43903,43904,43905,43906,43907,43908,43909,
+43910,43911,43912,43913,43914,43915,43916,43917,43918,43919,43920,43921,
+43922,43923,43924,43925,43926,43927,43928,43929,43930,43931,43932,43933,
+43934,43935,43936,43937,43938,43939,43940,43941,43942,43943,43944,43945,
+43946,43947,43948,43949,43950,43951,43952,43953,43954,43955,43956,43957,
+43958,43959,43960,43961,43962,43963,43964,43965,43966,43967,43968,43969,
+43970,43971,43972,43973,43974,43975,43976,43977,43978,43979,43980,43981,
+43982,43983,43984,43985,43986,43987,43988,43989,43990,43991,43992,43993,
+43994,43995,43996,43997,43998,43999,44000,44001,44002,44003,44004,44005,
+44006,44007,44008,44009,44010,44011,44012,44013,44014,44015,44016,44017,
+44018,44019,44020,44021,44022,44023,44024,44025,44026,44027,44028,44029,
+44030,44031,44032,44033,44034,44035,44036,44037,44038,44039,44040,44041,
+44042,44043,44044,44045,44046,44047,44048,44049,44050,44051,44052,44053,
+44054,44055,44056,44057,44058,44059,44060,44061,44062,44063,44064,44065,
+44066,44067,44068,44069,44070,44071,44072,44073,44074,44075,44076,44077,
+44078,44079,44080,44081,44082,44083,44084,44085,44086,44087,44088,44089,
+44090,44091,44092,44093,44094,44095,44096,44097,44098,44099,44100,44101,
+44102,44103,44104,44105,44106,44107,44108,44109,44110,44111,44112,44113,
+44114,44115,44116,44117,44118,44119,44120,44121,44122,44123,44124,44125,
+44126,44127,44128,44129,44130,44131,44132,44133,44134,44135,44136,44137,
+44138,44139,44140,44141,44142,44143,44144,44145,44146,44147,44148,44149,
+44150,44151,44152,44153,44154,44155,44156,44157,44158,44159,44160,44161,
+44162,44163,44164,44165,44166,44167,44168,44169,44170,44171,44172,44173,
+44174,44175,44176,44177,44178,44179,44180,44181,44182,44183,44184,44185,
+44186,44187,44188,44189,44190,44191,44192,44193,44194,44195,44196,44197,
+44198,44199,44200,44201,44202,44203,44204,44205,44206,44207,44208,44209,
+44210,44211,44212,44213,44214,44215,44216,44217,44218,44219,44220,44221,
+44222,44223,44224,44225,44226,44227,44228,44229,44230,44231,44232,44233,
+44234,44235,44236,44237,44238,44239,44240,44241,44242,44243,44244,44245,
+44246,44247,44248,44249,44250,44251,44252,44253,44254,44255,44256,44257,
+44258,44259,44260,44261,44262,44263,44264,44265,44266,44267,44268,44269,
+44270,44271,44272,44273,44274,44275,44276,44277,44278,44279,44280,44281,
+44282,44283,44284,44285,44286,44287,44288,44289,44290,44291,44292,44293,
+44294,44295,44296,44297,44298,44299,44300,44301,44302,44303,44304,44305,
+44306,44307,44308,44309,44310,44311,44312,44313,44314,44315,44316,44317,
+44318,44319,44320,44321,44322,44323,44324,44325,44326,44327,44328,44329,
+44330,44331,44332,44333,44334,44335,44336,44337,44338,44339,44340,44341,
+44342,44343,44344,44345,44346,44347,44348,44349,44350,44351,44352,44353,
+44354,44355,44356,44357,44358,44359,44360,44361,44362,44363,44364,44365,
+44366,44367,44368,44369,44370,44371,44372,44373,44374,44375,44376,44377,
+44378,44379,44380,44381,44382,44383,44384,44385,44386,44387,44388,44389,
+44390,44391,44392,44393,44394,44395,44396,44397,44398,44399,44400,44401,
+44402,44403,44404,44405,44406,44407,44408,44409,44410,44411,44412,44413,
+44414,44415,44416,44417,44418,44419,44420,44421,44422,44423,44424,44425,
+44426,44427,44428,44429,44430,44431,44432,44433,44434,44435,44436,44437,
+44438,44439,44440,44441,44442,44443,44444,44445,44446,44447,44448,44449,
+44450,44451,44452,44453,44454,44455,44456,44457,44458,44459,44460,44461,
+44462,44463,44464,44465,44466,44467,44468,44469,44470,44471,44472,44473,
+44474,44475,44476,44477,44478,44479,44480,44481,44482,44483,44484,44485,
+44486,44487,44488,44489,44490,44491,44492,44493,44494,44495,44496,44497,
+44498,44499,44500,44501,44502,44503,44504,44505,44506,44507,44508,44509,
+44510,44511,44512,44513,44514,44515,44516,44517,44518,44519,44520,44521,
+44522,44523,44524,44525,44526,44527,44528,44529,44530,44531,44532,44533,
+44534,44535,44536,44537,44538,44539,44540,44541,44542,44543,44544,44545,
+44546,44547,44548,44549,44550,44551,44552,44553,44554,44555,44556,44557,
+44558,44559,44560,44561,44562,44563,44564,44565,44566,44567,44568,44569,
+44570,44571,44572,44573,44574,44575,44576,44577,44578,44579,44580,44581,
+44582,44583,44584,44585,44586,44587,44588,44589,44590,44591,44592,44593,
+44594,44595,44596,44597,44598,44599,44600,44601,44602,44603,44604,44605,
+44606,44607,44608,44609,44610,44611,44612,44613,44614,44615,44616,44617,
+44618,44619,44620,44621,44622,44623,44624,44625,44626,44627,44628,44629,
+44630,44631,44632,44633,44634,44635,44636,44637,44638,44639,44640,44641,
+44642,44643,44644,44645,44646,44647,44648,44649,44650,44651,44652,44653,
+44654,44655,44656,44657,44658,44659,44660,44661,44662,44663,44664,44665,
+44666,44667,44668,44669,44670,44671,44672,44673,44674,44675,44676,44677,
+44678,44679,44680,44681,44682,44683,44684,44685,44686,44687,44688,44689,
+44690,44691,44692,44693,44694,44695,44696,44697,44698,44699,44700,44701,
+44702,44703,44704,44705,44706,44707,44708,44709,44710,44711,44712,44713,
+44714,44715,44716,44717,44718,44719,44720,44721,44722,44723,44724,44725,
+44726,44727,44728,44729,44730,44731,44732,44733,44734,44735,44736,44737,
+44738,44739,44740,44741,44742,44743,44744,44745,44746,44747,44748,44749,
+44750,44751,44752,44753,44754,44755,44756,44757,44758,44759,44760,44761,
+44762,44763,44764,44765,44766,44767,44768,44769,44770,44771,44772,44773,
+44774,44775,44776,44777,44778,44779,44780,44781,44782,44783,44784,44785,
+44786,44787,44788,44789,44790,44791,44792,44793,44794,44795,44796,44797,
+44798,44799,44800,44801,44802,44803,44804,44805,44806,44807,44808,44809,
+44810,44811,44812,44813,44814,44815,44816,44817,44818,44819,44820,44821,
+44822,44823,44824,44825,44826,44827,44828,44829,44830,44831,44832,44833,
+44834,44835,44836,44837,44838,44839,44840,44841,44842,44843,44844,44845,
+44846,44847,44848,44849,44850,44851,44852,44853,44854,44855,44856,44857,
+44858,44859,44860,44861,44862,44863,44864,44865,44866,44867,44868,44869,
+44870,44871,44872,44873,44874,44875,44876,44877,44878,44879,44880,44881,
+44882,44883,44884,44885,44886,44887,44888,44889,44890,44891,44892,44893,
+44894,44895,44896,44897,44898,44899,44900,44901,44902,44903,44904,44905,
+44906,44907,44908,44909,44910,44911,44912,44913,44914,44915,44916,44917,
+44918,44919,44920,44921,44922,44923,44924,44925,44926,44927,44928,44929,
+44930,44931,44932,44933,44934,44935,44936,44937,44938,44939,44940,44941,
+44942,44943,44944,44945,44946,44947,44948,44949,44950,44951,44952,44953,
+44954,44955,44956,44957,44958,44959,44960,44961,44962,44963,44964,44965,
+44966,44967,44968,44969,44970,44971,44972,44973,44974,44975,44976,44977,
+44978,44979,44980,44981,44982,44983,44984,44985,44986,44987,44988,44989,
+44990,44991,44992,44993,44994,44995,44996,44997,44998,44999,45000,45001,
+45002,45003,45004,45005,45006,45007,45008,45009,45010,45011,45012,45013,
+45014,45015,45016,45017,45018,45019,45020,45021,45022,45023,45024,45025,
+45026,45027,45028,45029,45030,45031,45032,45033,45034,45035,45036,45037,
+45038,45039,45040,45041,45042,45043,45044,45045,45046,45047,45048,45049,
+45050,45051,45052,45053,45054,45055,45056,45057,45058,45059,45060,45061,
+45062,45063,45064,45065,45066,45067,45068,45069,45070,45071,45072,45073,
+45074,45075,45076,45077,45078,45079,45080,45081,45082,45083,45084,45085,
+45086,45087,45088,45089,45090,45091,45092,45093,45094,45095,45096,45097,
+45098,45099,45100,45101,45102,45103,45104,45105,45106,45107,45108,45109,
+45110,45111,45112,45113,45114,45115,45116,45117,45118,45119,45120,45121,
+45122,45123,45124,45125,45126,45127,45128,45129,45130,45131,45132,45133,
+45134,45135,45136,45137,45138,45139,45140,45141,45142,45143,45144,45145,
+45146,45147,45148,45149,45150,45151,45152,45153,45154,45155,45156,45157,
+45158,45159,45160,45161,45162,45163,45164,45165,45166,45167,45168,45169,
+45170,45171,45172,45173,45174,45175,45176,45177,45178,45179,45180,45181,
+45182,45183,45184,45185,45186,45187,45188,45189,45190,45191,45192,45193,
+45194,45195,45196,45197,45198,45199,45200,45201,45202,45203,45204,45205,
+45206,45207,45208,45209,45210,45211,45212,45213,45214,45215,45216,45217,
+45218,45219,45220,45221,45222,45223,45224,45225,45226,45227,45228,45229,
+45230,45231,45232,45233,45234,45235,45236,45237,45238,45239,45240,45241,
+45242,45243,45244,45245,45246,45247,45248,45249,45250,45251,45252,45253,
+45254,45255,45256,45257,45258,45259,45260,45261,45262,45263,45264,45265,
+45266,45267,45268,45269,45270,45271,45272,45273,45274,45275,45276,45277,
+45278,45279,45280,45281,45282,45283,45284,45285,45286,45287,45288,45289,
+45290,45291,45292,45293,45294,45295,45296,45297,45298,45299,45300,45301,
+45302,45303,45304,45305,45306,45307,45308,45309,45310,45311,45312,45313,
+45314,45315,45316,45317,45318,45319,45320,45321,45322,45323,45324,45325,
+45326,45327,45328,45329,45330,45331,45332,45333,45334,45335,45336,45337,
+45338,45339,45340,45341,45342,45343,45344,45345,45346,45347,45348,45349,
+45350,45351,45352,45353,45354,45355,45356,45357,45358,45359,45360,45361,
+45362,45363,45364,45365,45366,45367,45368,45369,45370,45371,45372,45373,
+45374,45375,45376,45377,45378,45379,45380,45381,45382,45383,45384,45385,
+45386,45387,45388,45389,45390,45391,45392,45393,45394,45395,45396,45397,
+45398,45399,45400,45401,45402,45403,45404,45405,45406,45407,45408,45409,
+45410,45411,45412,45413,45414,45415,45416,45417,45418,45419,45420,45421,
+45422,45423,45424,45425,45426,45427,45428,45429,45430,45431,45432,45433,
+45434,45435,45436,45437,45438,45439,45440,45441,45442,45443,45444,45445,
+45446,45447,45448,45449,45450,45451,45452,45453,45454,45455,45456,45457,
+45458,45459,45460,45461,45462,45463,45464,45465,45466,45467,45468,45469,
+45470,45471,45472,45473,45474,45475,45476,45477,45478,45479,45480,45481,
+45482,45483,45484,45485,45486,45487,45488,45489,45490,45491,45492,45493,
+45494,45495,45496,45497,45498,45499,45500,45501,45502,45503,45504,45505,
+45506,45507,45508,45509,45510,45511,45512,45513,45514,45515,45516,45517,
+45518,45519,45520,45521,45522,45523,45524,45525,45526,45527,45528,45529,
+45530,45531,45532,45533,45534,45535,45536,45537,45538,45539,45540,45541,
+45542,45543,45544,45545,45546,45547,45548,45549,45550,45551,45552,45553,
+45554,45555,45556,45557,45558,45559,45560,45561,45562,45563,45564,45565,
+45566,45567,45568,45569,45570,45571,45572,45573,45574,45575,45576,45577,
+45578,45579,45580,45581,45582,45583,45584,45585,45586,45587,45588,45589,
+45590,45591,45592,45593,45594,45595,45596,45597,45598,45599,45600,45601,
+45602,45603,45604,45605,45606,45607,45608,45609,45610,45611,45612,45613,
+45614,45615,45616,45617,45618,45619,45620,45621,45622,45623,45624,45625,
+45626,45627,45628,45629,45630,45631,45632,45633,45634,45635,45636,45637,
+45638,45639,45640,45641,45642,45643,45644,45645,45646,45647,45648,45649,
+45650,45651,45652,45653,45654,45655,45656,45657,45658,45659,45660,45661,
+45662,45663,45664,45665,45666,45667,45668,45669,45670,45671,45672,45673,
+45674,45675,45676,45677,45678,45679,45680,45681,45682,45683,45684,45685,
+45686,45687,45688,45689,45690,45691,45692,45693,45694,45695,45696,45697,
+45698,45699,45700,45701,45702,45703,45704,45705,45706,45707,45708,45709,
+45710,45711,45712,45713,45714,45715,45716,45717,45718,45719,45720,45721,
+45722,45723,45724,45725,45726,45727,45728,45729,45730,45731,45732,45733,
+45734,45735,45736,45737,45738,45739,45740,45741,45742,45743,45744,45745,
+45746,45747,45748,45749,45750,45751,45752,45753,45754,45755,45756,45757,
+45758,45759,45760,45761,45762,45763,45764,45765,45766,45767,45768,45769,
+45770,45771,45772,45773,45774,45775,45776,45777,45778,45779,45780,45781,
+45782,45783,45784,45785,45786,45787,45788,45789,45790,45791,45792,45793,
+45794,45795,45796,45797,45798,45799,45800,45801,45802,45803,45804,45805,
+45806,45807,45808,45809,45810,45811,45812,45813,45814,45815,45816,45817,
+45818,45819,45820,45821,45822,45823,45824,45825,45826,45827,45828,45829,
+45830,45831,45832,45833,45834,45835,45836,45837,45838,45839,45840,45841,
+45842,45843,45844,45845,45846,45847,45848,45849,45850,45851,45852,45853,
+45854,45855,45856,45857,45858,45859,45860,45861,45862,45863,45864,45865,
+45866,45867,45868,45869,45870,45871,45872,45873,45874,45875,45876,45877,
+45878,45879,45880,45881,45882,45883,45884,45885,45886,45887,45888,45889,
+45890,45891,45892,45893,45894,45895,45896,45897,45898,45899,45900,45901,
+45902,45903,45904,45905,45906,45907,45908,45909,45910,45911,45912,45913,
+45914,45915,45916,45917,45918,45919,45920,45921,45922,45923,45924,45925,
+45926,45927,45928,45929,45930,45931,45932,45933,45934,45935,45936,45937,
+45938,45939,45940,45941,45942,45943,45944,45945,45946,45947,45948,45949,
+45950,45951,45952,45953,45954,45955,45956,45957,45958,45959,45960,45961,
+45962,45963,45964,45965,45966,45967,45968,45969,45970,45971,45972,45973,
+45974,45975,45976,45977,45978,45979,45980,45981,45982,45983,45984,45985,
+45986,45987,45988,45989,45990,45991,45992,45993,45994,45995,45996,45997,
+45998,45999,46000,46001,46002,46003,46004,46005,46006,46007,46008,46009,
+46010,46011,46012,46013,46014,46015,46016,46017,46018,46019,46020,46021,
+46022,46023,46024,46025,46026,46027,46028,46029,46030,46031,46032,46033,
+46034,46035,46036,46037,46038,46039,46040,46041,46042,46043,46044,46045,
+46046,46047,46048,46049,46050,46051,46052,46053,46054,46055,46056,46057,
+46058,46059,46060,46061,46062,46063,46064,46065,46066,46067,46068,46069,
+46070,46071,46072,46073,46074,46075,46076,46077,46078,46079,46080,46081,
+46082,46083,46084,46085,46086,46087,46088,46089,46090,46091,46092,46093,
+46094,46095,46096,46097,46098,46099,46100,46101,46102,46103,46104,46105,
+46106,46107,46108,46109,46110,46111,46112,46113,46114,46115,46116,46117,
+46118,46119,46120,46121,46122,46123,46124,46125,46126,46127,46128,46129,
+46130,46131,46132,46133,46134,46135,46136,46137,46138,46139,46140,46141,
+46142,46143,46144,46145,46146,46147,46148,46149,46150,46151,46152,46153,
+46154,46155,46156,46157,46158,46159,46160,46161,46162,46163,46164,46165,
+46166,46167,46168,46169,46170,46171,46172,46173,46174,46175,46176,46177,
+46178,46179,46180,46181,46182,46183,46184,46185,46186,46187,46188,46189,
+46190,46191,46192,46193,46194,46195,46196,46197,46198,46199,46200,46201,
+46202,46203,46204,46205,46206,46207,46208,46209,46210,46211,46212,46213,
+46214,46215,46216,46217,46218,46219,46220,46221,46222,46223,46224,46225,
+46226,46227,46228,46229,46230,46231,46232,46233,46234,46235,46236,46237,
+46238,46239,46240,46241,46242,46243,46244,46245,46246,46247,46248,46249,
+46250,46251,46252,46253,46254,46255,46256,46257,46258,46259,46260,46261,
+46262,46263,46264,46265,46266,46267,46268,46269,46270,46271,46272,46273,
+46274,46275,46276,46277,46278,46279,46280,46281,46282,46283,46284,46285,
+46286,46287,46288,46289,46290,46291,46292,46293,46294,46295,46296,46297,
+46298,46299,46300,46301,46302,46303,46304,46305,46306,46307,46308,46309,
+46310,46311,46312,46313,46314,46315,46316,46317,46318,46319,46320,46321,
+46322,46323,46324,46325,46326,46327,46328,46329,46330,46331,46332,46333,
+46334,46335,46336,46337,46338,46339,46340,46341,46342,46343,46344,46345,
+46346,46347,46348,46349,46350,46351,46352,46353,46354,46355,46356,46357,
+46358,46359,46360,46361,46362,46363,46364,46365,46366,46367,46368,46369,
+46370,46371,46372,46373,46374,46375,46376,46377,46378,46379,46380,46381,
+46382,46383,46384,46385,46386,46387,46388,46389,46390,46391,46392,46393,
+46394,46395,46396,46397,46398,46399,46400,46401,46402,46403,46404,46405,
+46406,46407,46408,46409,46410,46411,46412,46413,46414,46415,46416,46417,
+46418,46419,46420,46421,46422,46423,46424,46425,46426,46427,46428,46429,
+46430,46431,46432,46433,46434,46435,46436,46437,46438,46439,46440,46441,
+46442,46443,46444,46445,46446,46447,46448,46449,46450,46451,46452,46453,
+46454,46455,46456,46457,46458,46459,46460,46461,46462,46463,46464,46465,
+46466,46467,46468,46469,46470,46471,46472,46473,46474,46475,46476,46477,
+46478,46479,46480,46481,46482,46483,46484,46485,46486,46487,46488,46489,
+46490,46491,46492,46493,46494,46495,46496,46497,46498,46499,46500,46501,
+46502,46503,46504,46505,46506,46507,46508,46509,46510,46511,46512,46513,
+46514,46515,46516,46517,46518,46519,46520,46521,46522,46523,46524,46525,
+46526,46527,46528,46529,46530,46531,46532,46533,46534,46535,46536,46537,
+46538,46539,46540,46541,46542,46543,46544,46545,46546,46547,46548,46549,
+46550,46551,46552,46553,46554,46555,46556,46557,46558,46559,46560,46561,
+46562,46563,46564,46565,46566,46567,46568,46569,46570,46571,46572,46573,
+46574,46575,46576,46577,46578,46579,46580,46581,46582,46583,46584,46585,
+46586,46587,46588,46589,46590,46591,46592,46593,46594,46595,46596,46597,
+46598,46599,46600,46601,46602,46603,46604,46605,46606,46607,46608,46609,
+46610,46611,46612,46613,46614,46615,46616,46617,46618,46619,46620,46621,
+46622,46623,46624,46625,46626,46627,46628,46629,46630,46631,46632,46633,
+46634,46635,46636,46637,46638,46639,46640,46641,46642,46643,46644,46645,
+46646,46647,46648,46649,46650,46651,46652,46653,46654,46655,46656,46657,
+46658,46659,46660,46661,46662,46663,46664,46665,46666,46667,46668,46669,
+46670,46671,46672,46673,46674,46675,46676,46677,46678,46679,46680,46681,
+46682,46683,46684,46685,46686,46687,46688,46689,46690,46691,46692,46693,
+46694,46695,46696,46697,46698,46699,46700,46701,46702,46703,46704,46705,
+46706,46707,46708,46709,46710,46711,46712,46713,46714,46715,46716,46717,
+46718,46719,46720,46721,46722,46723,46724,46725,46726,46727,46728,46729,
+46730,46731,46732,46733,46734,46735,46736,46737,46738,46739,46740,46741,
+46742,46743,46744,46745,46746,46747,46748,46749,46750,46751,46752,46753,
+46754,46755,46756,46757,46758,46759,46760,46761,46762,46763,46764,46765,
+46766,46767,46768,46769,46770,46771,46772,46773,46774,46775,46776,46777,
+46778,46779,46780,46781,46782,46783,46784,46785,46786,46787,46788,46789,
+46790,46791,46792,46793,46794,46795,46796,46797,46798,46799,46800,46801,
+46802,46803,46804,46805,46806,46807,46808,46809,46810,46811,46812,46813,
+46814,46815,46816,46817,46818,46819,46820,46821,46822,46823,46824,46825,
+46826,46827,46828,46829,46830,46831,46832,46833,46834,46835,46836,46837,
+46838,46839,46840,46841,46842,46843,46844,46845,46846,46847,46848,46849,
+46850,46851,46852,46853,46854,46855,46856,46857,46858,46859,46860,46861,
+46862,46863,46864,46865,46866,46867,46868,46869,46870,46871,46872,46873,
+46874,46875,46876,46877,46878,46879,46880,46881,46882,46883,46884,46885,
+46886,46887,46888,46889,46890,46891,46892,46893,46894,46895,46896,46897,
+46898,46899,46900,46901,46902,46903,46904,46905,46906,46907,46908,46909,
+46910,46911,46912,46913,46914,46915,46916,46917,46918,46919,46920,46921,
+46922,46923,46924,46925,46926,46927,46928,46929,46930,46931,46932,46933,
+46934,46935,46936,46937,46938,46939,46940,46941,46942,46943,46944,46945,
+46946,46947,46948,46949,46950,46951,46952,46953,46954,46955,46956,46957,
+46958,46959,46960,46961,46962,46963,46964,46965,46966,46967,46968,46969,
+46970,46971,46972,46973,46974,46975,46976,46977,46978,46979,46980,46981,
+46982,46983,46984,46985,46986,46987,46988,46989,46990,46991,46992,46993,
+46994,46995,46996,46997,46998,46999,47000,47001,47002,47003,47004,47005,
+47006,47007,47008,47009,47010,47011,47012,47013,47014,47015,47016,47017,
+47018,47019,47020,47021,47022,47023,47024,47025,47026,47027,47028,47029,
+47030,47031,47032,47033,47034,47035,47036,47037,47038,47039,47040,47041,
+47042,47043,47044,47045,47046,47047,47048,47049,47050,47051,47052,47053,
+47054,47055,47056,47057,47058,47059,47060,47061,47062,47063,47064,47065,
+47066,47067,47068,47069,47070,47071,47072,47073,47074,47075,47076,47077,
+47078,47079,47080,47081,47082,47083,47084,47085,47086,47087,47088,47089,
+47090,47091,47092,47093,47094,47095,47096,47097,47098,47099,47100,47101,
+47102,47103,47104,47105,47106,47107,47108,47109,47110,47111,47112,47113,
+47114,47115,47116,47117,47118,47119,47120,47121,47122,47123,47124,47125,
+47126,47127,47128,47129,47130,47131,47132,47133,47134,47135,47136,47137,
+47138,47139,47140,47141,47142,47143,47144,47145,47146,47147,47148,47149,
+47150,47151,47152,47153,47154,47155,47156,47157,47158,47159,47160,47161,
+47162,47163,47164,47165,47166,47167,47168,47169,47170,47171,47172,47173,
+47174,47175,47176,47177,47178,47179,47180,47181,47182,47183,47184,47185,
+47186,47187,47188,47189,47190,47191,47192,47193,47194,47195,47196,47197,
+47198,47199,47200,47201,47202,47203,47204,47205,47206,47207,47208,47209,
+47210,47211,47212,47213,47214,47215,47216,47217,47218,47219,47220,47221,
+47222,47223,47224,47225,47226,47227,47228,47229,47230,47231,47232,47233,
+47234,47235,47236,47237,47238,47239,47240,47241,47242,47243,47244,47245,
+47246,47247,47248,47249,47250,47251,47252,47253,47254,47255,47256,47257,
+47258,47259,47260,47261,47262,47263,47264,47265,47266,47267,47268,47269,
+47270,47271,47272,47273,47274,47275,47276,47277,47278,47279,47280,47281,
+47282,47283,47284,47285,47286,47287,47288,47289,47290,47291,47292,47293,
+47294,47295,47296,47297,47298,47299,47300,47301,47302,47303,47304,47305,
+47306,47307,47308,47309,47310,47311,47312,47313,47314,47315,47316,47317,
+47318,47319,47320,47321,47322,47323,47324,47325,47326,47327,47328,47329,
+47330,47331,47332,47333,47334,47335,47336,47337,47338,47339,47340,47341,
+47342,47343,47344,47345,47346,47347,47348,47349,47350,47351,47352,47353,
+47354,47355,47356,47357,47358,47359,47360,47361,47362,47363,47364,47365,
+47366,47367,47368,47369,47370,47371,47372,47373,47374,47375,47376,47377,
+47378,47379,47380,47381,47382,47383,47384,47385,47386,47387,47388,47389,
+47390,47391,47392,47393,47394,47395,47396,47397,47398,47399,47400,47401,
+47402,47403,47404,47405,47406,47407,47408,47409,47410,47411,47412,47413,
+47414,47415,47416,47417,47418,47419,47420,47421,47422,47423,47424,47425,
+47426,47427,47428,47429,47430,47431,47432,47433,47434,47435,47436,47437,
+47438,47439,47440,47441,47442,47443,47444,47445,47446,47447,47448,47449,
+47450,47451,47452,47453,47454,47455,47456,47457,47458,47459,47460,47461,
+47462,47463,47464,47465,47466,47467,47468,47469,47470,47471,47472,47473,
+47474,47475,47476,47477,47478,47479,47480,47481,47482,47483,47484,47485,
+47486,47487,47488,47489,47490,47491,47492,47493,47494,47495,47496,47497,
+47498,47499,47500,47501,47502,47503,47504,47505,47506,47507,47508,47509,
+47510,47511,47512,47513,47514,47515,47516,47517,47518,47519,47520,47521,
+47522,47523,47524,47525,47526,47527,47528,47529,47530,47531,47532,47533,
+47534,47535,47536,47537,47538,47539,47540,47541,47542,47543,47544,47545,
+47546,47547,47548,47549,47550,47551,47552,47553,47554,47555,47556,47557,
+47558,47559,47560,47561,47562,47563,47564,47565,47566,47567,47568,47569,
+47570,47571,47572,47573,47574,47575,47576,47577,47578,47579,47580,47581,
+47582,47583,47584,47585,47586,47587,47588,47589,47590,47591,47592,47593,
+47594,47595,47596,47597,47598,47599,47600,47601,47602,47603,47604,47605,
+47606,47607,47608,47609,47610,47611,47612,47613,47614,47615,47616,47617,
+47618,47619,47620,47621,47622,47623,47624,47625,47626,47627,47628,47629,
+47630,47631,47632,47633,47634,47635,47636,47637,47638,47639,47640,47641,
+47642,47643,47644,47645,47646,47647,47648,47649,47650,47651,47652,47653,
+47654,47655,47656,47657,47658,47659,47660,47661,47662,47663,47664,47665,
+47666,47667,47668,47669,47670,47671,47672,47673,47674,47675,47676,47677,
+47678,47679,47680,47681,47682,47683,47684,47685,47686,47687,47688,47689,
+47690,47691,47692,47693,47694,47695,47696,47697,47698,47699,47700,47701,
+47702,47703,47704,47705,47706,47707,47708,47709,47710,47711,47712,47713,
+47714,47715,47716,47717,47718,47719,47720,47721,47722,47723,47724,47725,
+47726,47727,47728,47729,47730,47731,47732,47733,47734,47735,47736,47737,
+47738,47739,47740,47741,47742,47743,47744,47745,47746,47747,47748,47749,
+47750,47751,47752,47753,47754,47755,47756,47757,47758,47759,47760,47761,
+47762,47763,47764,47765,47766,47767,47768,47769,47770,47771,47772,47773,
+47774,47775,47776,47777,47778,47779,47780,47781,47782,47783,47784,47785,
+47786,47787,47788,47789,47790,47791,47792,47793,47794,47795,47796,47797,
+47798,47799,47800,47801,47802,47803,47804,47805,47806,47807,47808,47809,
+47810,47811,47812,47813,47814,47815,47816,47817,47818,47819,47820,47821,
+47822,47823,47824,47825,47826,47827,47828,47829,47830,47831,47832,47833,
+47834,47835,47836,47837,47838,47839,47840,47841,47842,47843,47844,47845,
+47846,47847,47848,47849,47850,47851,47852,47853,47854,47855,47856,47857,
+47858,47859,47860,47861,47862,47863,47864,47865,47866,47867,47868,47869,
+47870,47871,47872,47873,47874,47875,47876,47877,47878,47879,47880,47881,
+47882,47883,47884,47885,47886,47887,47888,47889,47890,47891,47892,47893,
+47894,47895,47896,47897,47898,47899,47900,47901,47902,47903,47904,47905,
+47906,47907,47908,47909,47910,47911,47912,47913,47914,47915,47916,47917,
+47918,47919,47920,47921,47922,47923,47924,47925,47926,47927,47928,47929,
+47930,47931,47932,47933,47934,47935,47936,47937,47938,47939,47940,47941,
+47942,47943,47944,47945,47946,47947,47948,47949,47950,47951,47952,47953,
+47954,47955,47956,47957,47958,47959,47960,47961,47962,47963,47964,47965,
+47966,47967,47968,47969,47970,47971,47972,47973,47974,47975,47976,47977,
+47978,47979,47980,47981,47982,47983,47984,47985,47986,47987,47988,47989,
+47990,47991,47992,47993,47994,47995,47996,47997,47998,47999,48000,48001,
+48002,48003,48004,48005,48006,48007,48008,48009,48010,48011,48012,48013,
+48014,48015,48016,48017,48018,48019,48020,48021,48022,48023,48024,48025,