Skip to content

W
wine-winehq
Commit 4d7f9f7c authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

winedbg: Fixed broken code about type management for binary operator.

parent 1395d145
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
programs/winedbg/expr.c
View file @ 4d7f9f7c
...@@ -482,16 +482,18 @@ struct dbg_lvalue expr_eval(struct expr* exp) ...@@ -482,16 +482,18 @@ struct dbg_lvalue expr_eval(struct expr* exp)
rtn.type.id = dbg_itype_signed_int; rtn.type.id = dbg_itype_signed_int;
rtn.type.module = 0; rtn.type.module = 0;
rtn.addr.Offset = (unsigned int)&exp->un.binop.result; rtn.addr.Offset = (unsigned int)&exp->un.binop.result;
type1 = exp1.type;
type2 = exp2.type;
switch (exp->un.binop.binop_type) switch (exp->un.binop.binop_type)
{ {
case EXP_OP_ADD: case EXP_OP_ADD:
if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) ||
tag != SymTagPointerType || tag != SymTagPointerType ||
!types_get_info(&exp1.type, TI_GET_TYPE, &type1)) !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id))
type1.id = dbg_itype_none; type1.id = dbg_itype_none;
if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) ||
tag != SymTagPointerType || tag != SymTagPointerType ||
!types_get_info(&exp2.type, TI_GET_TYPE, &type2)) !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id))
type2.id = dbg_itype_none; type2.id = dbg_itype_none;
scale1 = 1; scale1 = 1;
scale2 = 1; scale2 = 1;
...@@ -513,11 +515,11 @@ struct dbg_lvalue expr_eval(struct expr* exp) ...@@ -513,11 +515,11 @@ struct dbg_lvalue expr_eval(struct expr* exp)
case EXP_OP_SUB: case EXP_OP_SUB:
if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) ||
tag != SymTagPointerType || tag != SymTagPointerType ||
!types_get_info(&exp1.type, TI_GET_TYPE, &type1)) !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id))
type1.id = dbg_itype_none; type1.id = dbg_itype_none;
if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) ||
tag != SymTagPointerType || tag != SymTagPointerType ||
!types_get_info(&exp2.type, TI_GET_TYPE, &type2)) !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id))
type2.id = dbg_itype_none; type2.id = dbg_itype_none;
scale1 = 1; scale1 = 1;
scale2 = 1; scale2 = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment