wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Jacek Caban : vbscript: Added interp_mul implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8a526743a1d74348ba256277eb85d95bea67326d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a526743a1d74348ba256277e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:50 2011 +0200 vbscript: Added interp_mul implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4feb2a9..ace9c7c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -698,8 +698,26 @@ static HRESULT interp_div(exec_ctx_t *ctx) static HRESULT interp_mul(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarMul(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added multiplicative expression parser/ compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 2f3c235a44a258f4dbe99890c31f2d467bf6ba46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3c235a44a258f4dbe99890c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:39 2011 +0200 vbscript: Added multiplicative expression parser/compiler implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 9 ++++++++- dlls/vbscript/vbscript.h | 2 ++ 5 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 98b8abd..d14e8de 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -353,6 +353,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); + case EXPR_DIV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: @@ -365,6 +367,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mod); + case EXPR_MUL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NEQUAL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 925da12..4feb2a9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -690,6 +690,18 @@ static HRESULT interp_idiv(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_div(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_mul(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 3d180ce..e15a851 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -20,12 +20,14 @@ typedef enum { EXPR_ADD, EXPR_BOOL, EXPR_CONCAT, + EXPR_DIV, EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, EXPR_IDIV, EXPR_MEMBER, EXPR_MOD, + EXPR_MUL, EXPR_NEG, EXPR_NEQUAL, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 89cc569..7d574d1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -203,6 +203,13 @@ IntdivExpression { $$ = new_binary_expression(ctx, EXPR_IDIV, $1, $3); CHECK_ERROR; } MultiplicativeExpression + : ExpExpression { $$ = $1; } + | MultiplicativeExpression '*' ExpExpression + { $$ = new_binary_expression(ctx, EXPR_MUL, $1, $3); CHECK_ERROR; } + | MultiplicativeExpression '/' ExpExpression + { $$ = new_binary_expression(ctx, EXPR_DIV, $1, $3); CHECK_ERROR; } + +ExpExpression : UnaryExpression /* FIXME */ { $$ = $1; } UnaryExpression diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a460233..690cad3 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -103,6 +103,7 @@ typedef enum { X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ + X(div, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ @@ -113,6 +114,7 @@ typedef enum { X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(mod, 1, 0, 0) \ + X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_idiv implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 80eff04037e0639b2976ed67c6b0b08181aa99f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80eff04037e0639b2976ed67c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:28 2011 +0200 vbscript: Added interp_idiv implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 602a259..925da12 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -668,8 +668,26 @@ static HRESULT interp_mod(exec_ctx_t *ctx) static HRESULT interp_idiv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarIdiv(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d5565bd..b6330b2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -106,6 +106,11 @@ Call ok(getVT(2 mod null) = "VT_NULL", "getVT(2 mod null) = " & getVT(2 mod null Call ok(getVT(null mod 2) = "VT_NULL", "getVT(null mod 2) = " & getVT(null mod 2)) 'FIXME: Call ok(empty mod 2 = 0, "empty mod 2 = " & (empty mod 2)) +Call ok(5 \ 2 = 2, "5 \ 2 = " & (5\2)) +Call ok(4.6 \ 1.5 = 2, "4.6 \ 1.5 = " & (4.6\1.5)) +Call ok(4.6 \ 1.49 = 5, "4.6 \ 1.49 = " & (4.6\1.49)) +Call ok(2+3\4 = 2, "2+3\4 = " & (2+3\4)) + if false then ok false, "if false called" end if

1 0

Jacek Caban : vbscript: Added '\' expression parser/compiler implementation .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 3c47b1d2f033b170d781e6efed0c48f5bcbd03ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c47b1d2f033b170d781e6efe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:14 2011 +0200 vbscript: Added '\' expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 8 ++++++-- dlls/vbscript/vbscript.h | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 99505f6..98b8abd 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -359,6 +359,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); + case EXPR_IDIV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 49b4621..602a259 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -666,6 +666,12 @@ static HRESULT interp_mod(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_idiv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index fde8512..3d180ce 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,7 @@ typedef enum { EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, + EXPR_IDIV, EXPR_MEMBER, EXPR_MOD, EXPR_NEG, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4f8aa23..89cc569 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -198,8 +198,12 @@ ModExpression | ModExpression tMOD IntdivExpression { $$ = new_binary_expression(ctx, EXPR_MOD, $1, $3); CHECK_ERROR; } IntdivExpression - : UnaryExpression /* FIXME */ { $$ = $1; } + : MultiplicativeExpression { $$ = $1; } + | IntdivExpression '\\' MultiplicativeExpression + { $$ = new_binary_expression(ctx, EXPR_IDIV, $1, $3); CHECK_ERROR; } +MultiplicativeExpression + : UnaryExpression /* FIXME */ { $$ = $1; } UnaryExpression : LiteralExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a33b570..a460233 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -108,6 +108,7 @@ typedef enum { X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(idiv, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \

1 0

Jacek Caban : vbscript: Added interp_mod implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: bb62059cc99388b2ed42e6db2585b66664a0e26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb62059cc99388b2ed42e6db2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:02 2011 +0200 vbscript: Added interp_mod implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 7 +++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4858b0b..49b4621 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -644,8 +644,26 @@ static HRESULT interp_sub(exec_ctx_t *ctx) static HRESULT interp_mod(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarMod(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3b428f1..d5565bd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -99,6 +99,13 @@ Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) Call ok(2-empty = 2, "2-empty = " & (2-empty)) Call ok(2-x = -1, "2-x = " & (2-x)) +Call ok(9 Mod 6 = 3, "9 Mod 6 = " & (9 Mod 6)) +Call ok(11.6 Mod 5.5 = False, "11.6 Mod 5.5 = " & (11.6 Mod 5.5 = 0.6)) +Call ok(7 Mod 4+2 = 5, "7 Mod 4+2 <> 5") +Call ok(getVT(2 mod null) = "VT_NULL", "getVT(2 mod null) = " & getVT(2 mod null)) +Call ok(getVT(null mod 2) = "VT_NULL", "getVT(null mod 2) = " & getVT(null mod 2)) +'FIXME: Call ok(empty mod 2 = 0, "empty mod 2 = " & (empty mod 2)) + if false then ok false, "if false called" end if

1 0

Jacek Caban : vbscript: Added mod expression parser/compiler implementation .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 1c2ec6d44febc5117893f9cb94029824832744fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2ec6d44febc5117893f9cb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:53 2011 +0200 vbscript: Added mod expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/vbscript.h | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 71af0f3..99505f6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -361,6 +361,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); + case EXPR_MOD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NEQUAL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d768aab..4858b0b 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -642,6 +642,12 @@ static HRESULT interp_sub(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_mod(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index c8ed7f0..fde8512 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -24,6 +24,7 @@ typedef enum { EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, + EXPR_MOD, EXPR_NEG, EXPR_NEQUAL, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8efcc5a..4f8aa23 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -194,6 +194,10 @@ AdditiveExpression | AdditiveExpression '-' ModExpression { $$ = new_binary_expression(ctx, EXPR_SUB, $1, $3); CHECK_ERROR; } ModExpression + : IntdivExpression { $$ = $1; } + | ModExpression tMOD IntdivExpression { $$ = new_binary_expression(ctx, EXPR_MOD, $1, $3); CHECK_ERROR; } + +IntdivExpression : UnaryExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cf32705..a33b570 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -111,6 +111,7 @@ typedef enum { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ + X(mod, 1, 0, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added bytecode decompiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: d44940cc6a52d0ec9d53cd49dc17f502260916e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44940cc6a52d0ec9d53cd49d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:41 2011 +0200 vbscript: Added bytecode decompiler implementation. --- dlls/vbscript/compile.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c50452a..71af0f3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -25,6 +25,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +WINE_DECLARE_DEBUG_CHANNEL(vbscript_disas); typedef struct { parser_ctx_t parser; @@ -45,14 +46,51 @@ static HRESULT compile_expression(compile_ctx_t*,expression_t*); static HRESULT compile_statement(compile_ctx_t*,statement_t*); static const struct { + const char *op_str; instr_arg_type_t arg1_type; instr_arg_type_t arg2_type; } instr_info[] = { -#define X(n,a,b,c) {b,c}, +#define X(n,a,b,c) {#n,b,c}, OP_LIST #undef X }; +static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) +{ + switch(type) { + case ARG_STR: + case ARG_BSTR: + TRACE_(vbscript_disas)("\t%s", debugstr_w(arg->str)); + break; + case ARG_INT: + TRACE_(vbscript_disas)("\t%d", arg->uint); + break; + case ARG_UINT: + case ARG_ADDR: + TRACE_(vbscript_disas)("\t%u", arg->uint); + break; + case ARG_DOUBLE: + TRACE_(vbscript_disas)("\t%lf", *arg->dbl); + break; + case ARG_NONE: + break; + default: + assert(0); + } +} + +static void dump_code(compile_ctx_t *ctx) +{ + instr_t *instr; + + for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + TRACE_(vbscript_disas)("%d:\t%s", instr-ctx->code->instrs, instr_info[instr->op].op_str); + dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); + dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2); + TRACE_(vbscript_disas)("\n"); + } +} + static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) { return vbsheap_alloc(&vbscode->heap, size); @@ -670,6 +708,9 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) parser_release(&ctx.parser); + if(TRACE_ON(vbscript_disas)) + dump_code(&ctx); + list_add_tail(&script->code_list, &ctx.code->entry); *ret = ctx.code; return S_OK;

1 0

Jacek Caban : vbscript: Added if statement tests.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: d028453f58bf86439795432e106c09ab46ad4271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d028453f58bf86439795432e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:26 2011 +0200 vbscript: Added if statement tests. --- dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6335069..3b428f1 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -81,10 +81,10 @@ Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) Call ok("ab" & x = "abxx", """ab"" & x = " & ("ab"&x)) -'if(isEnglishLocale) then -' Call ok("" & true = "True", """"" & true = " & true) -' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) -'end if +if(isEnglishLocale) then + Call ok("" & true = "True", """"" & true = " & true) + Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) +end if x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) @@ -99,4 +99,52 @@ Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) Call ok(2-empty = 2, "2-empty = " & (2-empty)) Call ok(2-x = -1, "2-x = " & (2-x)) +if false then + ok false, "if false called" +end if + +x = true +if x then + x = false +end if +Call ok(not x, "x is false, if not evaluated?") + +x = false +If false Then + Call ok(false, "inside if false") +Else + x = true +End If +Call ok(x, "else not called?") + +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not True Then + Call ok(false, "inside elseif not true") +Else + x = true +End If +Call ok(x, "else not called?") + +x = false +If false Then + Call ok(false, "inside if false") + x = 1 + y = 10+x +ElseIf not False Then + x = true +Else + Call ok(false, "inside else not true") +End If +Call ok(x, "elseif not called?") + +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then + x = true +End If +Call ok(x, "elseif not called?") + reportSuccess()

1 0

Jacek Caban : vbscript: Added interp_jmp_false implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 0722695cc089ec4d8d13eb377514132d0e23d86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0722695cc089ec4d8d13eb377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:13 2011 +0200 vbscript: Added interp_jmp_false implementation. --- dlls/vbscript/interp.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e444016..d768aab 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -384,8 +384,24 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp_false(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg = ctx->instr->arg1.uint; + variant_val_t val; + HRESULT hres; + + TRACE("%u\n", arg); + + hres = stack_pop_val(ctx, &val); + if(V_VT(val.v) != VT_BOOL) { + FIXME("unsupported for %s\n", debugstr_variant(val.v)); + release_val(&val); + return E_NOTIMPL; + } + + if(V_BOOL(val.v)) + ctx->instr++; + else + instr_jmp(ctx, ctx->instr->arg1.uint); + return S_OK; } static HRESULT interp_ret(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added interp_jmp implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8689884c194120339ee5853babc7ab4578e5e0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8689884c194120339ee5853ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:38:58 2011 +0200 vbscript: Added interp_jmp implementation. --- dlls/vbscript/interp.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e9569fa..e444016 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -191,6 +191,11 @@ static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) return S_OK; } +static inline void instr_jmp(exec_ctx_t *ctx, unsigned addr) +{ + ctx->instr = ctx->code->instrs + addr; +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -369,8 +374,12 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) static HRESULT interp_jmp(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg = ctx->instr->arg1.uint; + + TRACE("%u\n", arg); + + instr_jmp(ctx, arg); + return S_OK; } static HRESULT interp_jmp_false(exec_ctx_t *ctx)

1 0

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 September 2011