Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
fc4948af
Commit
fc4948af
authored
13 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
jscript: Use bytecode for '&=' expression implementation.
parent
1ef48642
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/jscript/compile.c
+2
-0
2 additions, 0 deletions
dlls/jscript/compile.c
dlls/jscript/engine.c
+0
-29
0 additions, 29 deletions
dlls/jscript/engine.c
dlls/jscript/engine.h
+0
-1
0 additions, 1 deletion
dlls/jscript/engine.h
dlls/jscript/parser.y
+1
-1
1 addition, 1 deletion
dlls/jscript/parser.y
with
3 additions
and
31 deletions
dlls/jscript/compile.c
+
2
−
0
View file @
fc4948af
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/engine.c
+
0
−
29
View file @
fc4948af
...
...
@@ -2164,25 +2164,6 @@ static HRESULT interp_xor(exec_ctx_t *ctx)
return
stack_push_int
(
ctx
,
l
^
r
);
}
/* 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
)
{
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/engine.h
+
0
−
1
View file @
fc4948af
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
dlls/jscript/parser.y
+
1
−
1
View file @
fc4948af
...
...
@@ -1348,7 +1348,7 @@ static const expression_eval_t expression_eval_table[] = {
compiled_expression_eval,
compiled_expression_eval,
compiled_expression_eval,
assign_an
d_expression_eval,
compile
d_expression_eval,
compiled_expression_eval,
compiled_expression_eval,
compiled_expression_eval,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment