commit 02ecb68453d0e732c5486b438e037e75857a8b67
author Eric Pouech <eric.pouech@wanadoo.fr> Fri Dec 21 20:29:58 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 21 20:29:58 2001 +0000
tree 6690c73beaf9a284639420b7d728983649d3c830
parent c19bb1ab3f684f5bea19077a87b6d1980eae4808

Fixed stabs parsing for GCC 3.0 (default types).
Added boolean type support.
Simplified internal types handling.

debugger/expr.c

diff --git a/debugger/expr.c b/debugger/expr.c
index 45492f1..aa45239 100644
--- a/debugger/expr.c
+++ b/debugger/expr.c
@@ -314,19 +314,19 @@
 	 rtn.cookie = DV_TARGET;
       break;
     case EXPR_TYPE_STRING:
-      rtn.type = DEBUG_TypeString;
+      rtn.type = DEBUG_GetBasicType(DT_BASIC_STRING);
       rtn.cookie = DV_HOST;
       rtn.addr.off = (unsigned int) &exp->un.string.str;
       rtn.addr.seg = 0;
       break;
     case EXPR_TYPE_CONST:
-      rtn.type = DEBUG_TypeIntConst;
+      rtn.type = DEBUG_GetBasicType(DT_BASIC_CONST_INT);
       rtn.cookie = DV_HOST;
       rtn.addr.off = (unsigned int) &exp->un.constant.value;
       rtn.addr.seg = 0;
       break;
     case EXPR_TYPE_US_CONST:
-      rtn.type = DEBUG_TypeUSInt;
+      rtn.type = DEBUG_GetBasicType(DT_BASIC_USHORTINT);
       rtn.cookie = DV_HOST;
       rtn.addr.off = (unsigned int) &exp->un.u_const.value;
       rtn.addr.seg = 0;
@@ -431,7 +431,7 @@
        */
       exp->un.call.result = 0;
 #endif
-      rtn.type = DEBUG_TypeInt;
+      rtn.type = DEBUG_GetBasicType(DT_BASIC_INT);
       rtn.cookie = DV_HOST;
       rtn.addr.off = (unsigned int) &exp->un.call.result;
 
@@ -456,13 +456,14 @@
 	{
 	  RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL);
 	}
-      if( exp1.type == DEBUG_TypeIntConst && exp2.type == DEBUG_TypeIntConst )
+      if( exp1.type == DEBUG_GetBasicType(DT_BASIC_CONST_INT) && 
+          exp2.type == DEBUG_GetBasicType(DT_BASIC_CONST_INT) )
 	{
 	  rtn.type = exp1.type;
 	}
       else
 	{
-	  rtn.type = DEBUG_TypeInt;
+          rtn.type = DEBUG_GetBasicType(DT_BASIC_INT);
 	}
       rtn.addr.seg = 0;
       rtn.addr.off = (unsigned int) &exp->un.binop.result;
@@ -595,13 +596,13 @@
 	}
       rtn.addr.seg = 0;
       rtn.addr.off = (unsigned int) &exp->un.unop.result;
-      if( exp1.type == DEBUG_TypeIntConst )
+      if( exp1.type == DEBUG_GetBasicType(DT_BASIC_CONST_INT) )
 	{
 	  rtn.type = exp1.type;
 	}
       else
 	{
-	  rtn.type = DEBUG_TypeInt;
+	  rtn.type = DEBUG_GetBasicType(DT_BASIC_INT);
 	}
       switch(exp->un.unop.unop_type)
 	{