wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Piotr Caban : msvcp90: Added _Locinfo::_Getdays implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 0c7ed2bdda62ee6da5a7a39f8bc4b826d41b5f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ed2bdda62ee6da5a7a39f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:54 2011 +0100 msvcp90: Added _Locinfo::_Getdays implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1a637c0..1163b31 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -28,6 +28,8 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +char* __cdecl _Getdays(void); + typedef int category; typedef struct _locale_id { @@ -931,10 +933,20 @@ int __thiscall _Locinfo__Getdateorder(const _Locinfo *this) /* ?_Getdays@_Locinfo@std@@QBEPBDXZ */ /* ?_Getdays@_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getdays, 4) -const char* __thiscall _Locinfo__Getdays(const _Locinfo *this) +const char* __thiscall _Locinfo__Getdays(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + char *days = _Getdays(); + + TRACE("(%p)\n", this); + + if(days) { + MSVCP_basic_string_char_dtor(&this->days); + MSVCP_basic_string_char_ctor_cstr(&this->days, days); + free(days); + } + + return this->days.size ? MSVCP_basic_string_char_c_str(&this->days) : + ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday"; } /* ?_Getmonths@_Locinfo@std@@QBEPBDXZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getname implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 91c6a55c2cc7ddc873ed17b1272135d5185a3393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c6a55c2cc7ddc873ed17b12… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:41 2011 +0100 msvcp90: Added _Locinfo::_Getname implementation. --- dlls/msvcp90/locale.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 4e9e5a0..1a637c0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -978,8 +978,11 @@ const struct lconv* __thiscall _Locinfo__Getlconv(const _Locinfo *this) DEFINE_THISCALL_WRAPPER_RETPTR(_Locinfo__Getname, 4) basic_string_char __thiscall _Locinfo__Getname(const _Locinfo *this) { - basic_string_char ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); + basic_string_char ret; + + TRACE("(%p)\n", this); + + MSVCP_basic_string_char_copy_ctor(&ret, &this->newlocname); return ret; }

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getlconv implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 81434aabff472dd1797d3ee479f0ad67ef694884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81434aabff472dd1797d3ee47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:28 2011 +0100 msvcp90: Added _Locinfo::_Getlconv implementation. --- dlls/msvcp90/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ae270ae..4e9e5a0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -969,8 +969,8 @@ const char* __thiscall _Locinfo__Gettrue(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Getlconv, 4) const struct lconv* __thiscall _Locinfo__Getlconv(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return localeconv(); } /* ?_Getname@_Locinfo@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo:: _Getfalse and _Gettrue implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: dc1a38d38544b05790da6f027a6bcdead3f5536f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1a38d38544b05790da6f027… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:15 2011 +0100 msvcp90: Added _Locinfo::_Getfalse and _Gettrue implementation. --- dlls/msvcp90/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a668d18..ae270ae 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -951,8 +951,8 @@ const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Getfalse, 4) const char* __thiscall _Locinfo__Getfalse(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return "false"; } /* ?_Gettrue@_Locinfo@std@@QBEPBDXZ */ @@ -960,8 +960,8 @@ const char* __thiscall _Locinfo__Getfalse(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Gettrue, 4) const char* __thiscall _Locinfo__Gettrue(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return "true"; } /* ?_Getlconv@_Locinfo@std@@QBEPBUlconv@@XZ */

1 0

Piotr Caban : msvcp90: Added _Getcvt implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 56c1c75b7282c717a41819ee99c6781368a7bf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c1c75b7282c717a41819ee9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:05 2011 +0100 msvcp90: Added _Getcvt implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2fd3bd1..a668d18 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -897,14 +897,26 @@ _Ctypevec __thiscall _Locinfo__Getctype(const _Locinfo *this) return _Getctype(); } +/* _Getcvt */ +_Cvtvec __cdecl _Getcvt(void) +{ + _Cvtvec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_codepage; + ret.handle = locale->locinfo->lc_handle[LC_CTYPE]; + _free_locale(locale); + return ret; +} + /* ?_Getcvt@_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ /* ?_Getcvt@_Locinfo@std@@QEBA?AU_Cvtvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 4) _Cvtvec __thiscall _Locinfo__Getcvt(const _Locinfo *this) { - _Cvtvec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getcvt(); } /* ?_Getdateorder@_Locinfo@std@@QBEHXZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index bcaaa1c..1f7ef62 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5752,7 +5752,7 @@ # extern _FXbig @ cdecl _Getcoll() @ cdecl _Getctype() -@ stub _Getcvt +@ cdecl _Getcvt() @ stub _Getdateorder @ stub _Getwctype @ stub _Getwctypes

1 0

Jacek Caban : jscript: Use bytecode for '>>=' expression.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: d30bfb6e54d8d0f62606328d1e83885efa6c1e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30bfb6e54d8d0f62606328d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:03:35 2011 +0100 jscript: Use bytecode for '>>=' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 40 ---------------------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2fa7275..d733c33 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_ASSIGNOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); + case EXPR_ASSIGNRSHIFT: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift); case EXPR_ASSIGNXOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); case EXPR_BAND: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f6b9762..63ae9d7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3120,26 +3120,6 @@ HRESULT left_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.7.2 */ -static HRESULT rshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - DWORD ri; - INT li; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li >> (ri&0x1f); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.7.2 */ static HRESULT interp_rshift(exec_ctx_t *ctx) { DWORD r; @@ -3157,16 +3137,6 @@ static HRESULT interp_rshift(exec_ctx_t *ctx) return stack_push_int(ctx, l >> (r&0x1f)); } -/* ECMA-262 3rd Edition 11.7.2 */ -HRESULT right_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return binary_expr_eval(ctx, expr, rshift_eval, ei, ret); -} - /* ECMA-262 3rd Edition 11.7.3 */ static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { @@ -3233,16 +3203,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DW } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_rshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 504462c..dc7f6ac 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -569,7 +569,6 @@ HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5d42ef0..3322206 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1341,7 +1341,7 @@ static const expression_eval_t expression_eval_table[] = { right2_shift_expression_eval, compiled_expression_eval, assign_lshift_expression_eval, - assign_rshift_expression_eval, + compiled_expression_eval, assign_rrshift_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '>>' expression.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 28013dfa6faf4655d653c22ae5349d4b5a3cdca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28013dfa6faf4655d653c22ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:03:22 2011 +0100 jscript: Use bytecode for '>>' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 23 +++++++++++++++++++++++ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0acf483..2fa7275 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -689,6 +689,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, -1); case EXPR_PREINC: return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1); + case EXPR_RSHIFT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_rshift); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 81033f2..f6b9762 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -174,6 +174,11 @@ static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); } +static inline HRESULT stack_pop_uint(exec_ctx_t *ctx, DWORD *r) +{ + return to_uint32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); +} + static inline IDispatch *stack_pop_objid(exec_ctx_t *ctx, DISPID *id) { assert(V_VT(stack_top(ctx)) == VT_INT && V_VT(stack_topn(ctx, 1)) == VT_DISPATCH); @@ -3135,6 +3140,24 @@ static HRESULT rshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsex } /* ECMA-262 3rd Edition 11.7.2 */ +static HRESULT interp_rshift(exec_ctx_t *ctx) +{ + DWORD r; + INT l; + HRESULT hres; + + hres = stack_pop_uint(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l >> (r&0x1f)); +} + +/* ECMA-262 3rd Edition 11.7.2 */ HRESULT right_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 9758377..504462c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -82,6 +82,7 @@ typedef struct _func_stack { X(postinc, 1, ARG_INT, 0) \ X(preinc, 1, ARG_INT, 0) \ X(regexp, 1, ARG_STR, ARG_INT) \ + X(rshift, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ X(throw, 0, ARG_UINT, 0) \ @@ -566,7 +567,6 @@ HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6a97307..5d42ef0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1337,7 +1337,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, left_shift_expression_eval, - right_shift_expression_eval, + compiled_expression_eval, right2_shift_expression_eval, compiled_expression_eval, assign_lshift_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '&=' expression implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: fc4948af2c1de60fd1c8d5587bf40749313e5515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4948af2c1de60fd1c8d5587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:03:09 2011 +0100 jscript: Use bytecode for '&=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ----------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9e1ed6a..0acf483 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -613,6 +613,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); case EXPR_ASSIGNADD: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_add); + case EXPR_ASSIGNAND: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_ASSIGNSUB: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_ASSIGNMUL: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 50aab41..81033f2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2165,25 +2165,6 @@ static HRESULT interp_xor(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.10 */ -static HRESULT bitand_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - INT li, ri; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_int32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li&ri; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.10 */ static HRESULT interp_and(exec_ctx_t *ctx) { INT l, r; @@ -3248,16 +3229,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); -} - static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 582bc1f..9758377 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -571,7 +571,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 2d8361c..6a97307 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1348,7 +1348,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_and_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for binary and implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 1ef486421ed94e54094545e391f864701ece9cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef486421ed94e54094545e39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:02:53 2011 +0100 jscript: Use bytecode for binary and implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f0f9cc0..9e1ed6a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_ASSIGNXOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); + case EXPR_BAND: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f72ee42..50aab41 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2184,13 +2184,22 @@ static HRESULT bitand_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsex } /* ECMA-262 3rd Edition 11.10 */ -HRESULT binary_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_and(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + INT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, bitand_eval, ei, ret); + hres = stack_pop_int(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l&r); } /* ECMA-262 3rd Edition 11.8.6 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4bee824..582bc1f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,6 +43,7 @@ typedef struct _func_stack { #define OP_LIST \ X(add, 1, 0,0) \ + X(and, 1, 0,0) \ X(array, 1, 0,0) \ X(assign, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ @@ -561,7 +562,6 @@ HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index e7eadfa..2d8361c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1309,7 +1309,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - binary_and_expression_eval, + compiled_expression_eval, instanceof_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for array literal expressions.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 558d759465898c20135da6ed03106d454ccdf18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=558d759465898c20135da6ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:02:40 2011 +0100 jscript: Use bytecode for array literal expressions. --- dlls/jscript/compile.c | 30 ++++++++++++++++++++++ dlls/jscript/engine.c | 65 ++++++++++++++++++++---------------------------- dlls/jscript/engine.h | 3 +- dlls/jscript/parser.y | 2 +- 4 files changed, 60 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 483c9de..f0f9cc0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -570,6 +570,34 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) } } +static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expression_t *expr) +{ + unsigned i, elem_cnt = expr->length; + array_element_t *iter; + HRESULT hres; + + for(iter = expr->element_list; iter; iter = iter->next) { + elem_cnt += iter->elision+1; + + for(i=0; i < iter->elision; i++) { + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + } + + hres = compile_expression(ctx, iter->expr); + if(FAILED(hres)) + return hres; + } + + for(i=0; i < expr->length; i++) { + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + } + + return push_instr_uint(ctx, OP_carray, elem_cnt); +} + + static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, BOOL *no_ret) { switch(expr->type) { @@ -579,6 +607,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); case EXPR_ARRAY: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array); + case EXPR_ARRAYLIT: + return compile_array_literal(ctx, (array_literal_expression_t*)expr); case EXPR_ASSIGN: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); case EXPR_ASSIGNADD: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 467d686..f72ee42 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2001,54 +2001,33 @@ static HRESULT interp_regexp(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.1.4 */ -HRESULT array_literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_carray(exec_ctx_t *ctx) { - array_literal_expression_t *expr = (array_literal_expression_t*)_expr; - DWORD length = 0, i = 0; - array_element_t *elem; + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; jsdisp_t *array; - exprval_t exprval; - VARIANT val; + VARIANT *v, r; + unsigned i; HRESULT hres; - TRACE("\n"); - - for(elem = expr->element_list; elem; elem = elem->next) - length += elem->elision+1; - length += expr->length; + TRACE("%u\n", arg); - hres = create_array(ctx, length, &array); + hres = create_array(ctx->parser->script, arg, &array); if(FAILED(hres)) return hres; - for(elem = expr->element_list; elem; elem = elem->next) { - i += elem->elision; - - hres = expr_eval(ctx, elem->expr, 0, ei, &exprval); - if(FAILED(hres)) - break; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - break; - - hres = jsdisp_propput_idx(array, i, &val, ei, NULL/*FIXME*/); - VariantClear(&val); - if(FAILED(hres)) - break; - - i++; - } - - if(FAILED(hres)) { - jsdisp_release(array); - return hres; + i = arg; + while(i--) { + v = stack_pop(ctx); + hres = jsdisp_propput_idx(array, i, v, &ctx->ei, NULL/*FIXME*/); + VariantClear(v); + if(FAILED(hres)) { + jsdisp_release(array); + return hres; + } } - ret->type = EXPRVAL_VARIANT; - var_set_jsdisp(&ret->u.var, array); - return S_OK; + var_set_jsdisp(&r, array); + return stack_push(ctx, &r); } /* ECMA-262 3rd Edition 11.1.5 */ @@ -3270,6 +3249,16 @@ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); } +static HRESULT interp_undefined(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_EMPTY; + return stack_push(ctx, &v); +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dab692f..4bee824 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -49,6 +49,7 @@ typedef struct _func_stack { X(bneg, 1, 0,0) \ X(call, 1, ARG_UINT, ARG_UINT) \ X(call_member,1, ARG_UINT, ARG_UINT) \ + X(carray, 1, ARG_UINT, 0) \ X(delete, 1, 0,0) \ X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ @@ -88,6 +89,7 @@ typedef struct _func_stack { X(refval, 1, 0,0) \ X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ + X(undefined, 1, 0,0) \ X(void, 1, 0,0) \ X(xor, 1, 0,0) @@ -557,7 +559,6 @@ HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,e HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 4fbd678..e7eadfa 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1359,7 +1359,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, function_expression_eval, identifier_expression_eval, - array_literal_expression_eval, + compiled_expression_eval, property_value_expression_eval, compiled_expression_eval };

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011