is_unsigned

Author: tyfkda

src/_debug/dump_expr.c

@@ -95,7 +95,7 @@ void dump_expr(FILE *fp, Expr *expr) {
   assert(expr != NULL);
   switch (expr->kind) {
   case EX_FIXNUM:
-    if (expr->type->kind != TY_FIXNUM || expr->type->fixnum.is_unsigned)
+    if (is_unsigned(expr->type))
       fprintf(fp, "%" PRIu64 "U", expr->fixnum);
     else
       fprintf(fp, "%" PRId64, expr->fixnum);

src/cc/backend/codegen_expr.c

@@ -67,11 +67,8 @@ static struct CompareExpr gen_compare_expr(enum ExprKind kind, Expr *lhs, Expr *
   enum ConditionKind cond = kind + (COND_EQ - EX_EQ);
 
   int flag = 0;
-  if ((is_fixnum(lhs->type) && lhs->type->fixnum.is_unsigned) ||
-       lhs->type->kind == TY_PTR) {
-    // unsigned
+  if (is_unsigned(lhs->type))
     flag = COND_UNSIGNED;
-  }
 
   VReg *lhs_reg = gen_expr(lhs);
   VReg *rhs_reg = gen_expr(rhs);

src/cc/frontend/expr.c

@@ -109,7 +109,7 @@ Expr *make_cast(Type *type, const Token *token, Expr *sub, bool is_explicit) {
       return sub;
     case EX_FIXNUM:
       if (type->kind == TY_FLONUM) {
-        Flonum flonum = (sub->type->kind != TY_FIXNUM || sub->type->fixnum.is_unsigned)
+        Flonum flonum = is_unsigned(sub->type)
                             ? (Flonum)(UFixnum)sub->fixnum
                             : (Flonum)sub->fixnum;
         return new_expr_flolit(type, sub->token, flonum);
@@ -138,8 +138,7 @@ Expr *make_cast(Type *type, const Token *token, Expr *sub, bool is_explicit) {
 #if XCC_TARGET_ARCH == XCC_ARCH_X64 && !defined(__NO_FLONUM)
   // On x64, cannot cast from double to uint64_t directly.
   size_t dst_size = type_size(type);
-  if (is_flonum(sub->type) &&
-      is_fixnum(type) && type->fixnum.is_unsigned && dst_size >= 8) {
+  if (is_flonum(sub->type) && is_unsigned(type) && dst_size >= 8) {
     // Transform from (uint64_t)flonum
     //   to: (flonum <= INT64_MAX) ? (int64_t)flonum
     //                             : ((int64_t)(flonum - (INT64_MAX + 1UL)) ^ (1L << 63))
@@ -203,8 +202,8 @@ static bool cast_numbers(Expr **pLhs, Expr **pRhs, bool make_int) {
     *pLhs = promote_to_int(lhs);
     *pRhs = promote_to_int(rhs);
   } else if (changed || !same_type_without_qualifier(ltype, rtype, true)) {
-    int l = (type_size(ltype) << 1) | (ltype->fixnum.is_unsigned ? 1 : 0);
-    int r = (type_size(rtype) << 1) | (rtype->fixnum.is_unsigned ? 1 : 0);
+    int l = (type_size(ltype) << 1) | ltype->fixnum.is_unsigned;
+    int r = (type_size(rtype) << 1) | rtype->fixnum.is_unsigned;
     Type *type = l >= r ? ltype : rtype;
     *pLhs = make_cast(type, lhs->token, lhs, false);
     *pRhs = make_cast(type, rhs->token, rhs, false);

src/wcc/gen_wasm.c

@@ -37,8 +37,8 @@ static void gen_compare_expr(enum ExprKind kind, Expr *lhs, Expr *rhs, bool need
   if (is_flonum(lhs->type)) {
     index = lhs->type->flonum.kind >= FL_DOUBLE ? 5 : 4;
   } else {
-    index = (!is_fixnum(lhs->type) || lhs->type->fixnum.is_unsigned ? 2 : 0) +
-            (type_size(lhs->type) > I32_SIZE ? 1 : 0);
+    index = (is_unsigned(lhs->type) << 1) +
+            (type_size(lhs->type) > I32_SIZE);
   }
 
   static const unsigned char OpTable[][6] = {

src/wcc/gen_wasm_expr.c

@@ -34,7 +34,7 @@ void gen_load(const Type *type) {
   case TY_FIXNUM:
   case TY_PTR:
     {
-      bool u = !is_fixnum(type) || type->fixnum.is_unsigned;
+      bool u = is_unsigned(type);
       switch (type_size(type)) {
       case 1:  ADD_CODE(u ? OP_I32_LOAD8_U : OP_I32_LOAD8_S, 0, 0); break;
       case 2:  ADD_CODE(u ? OP_I32_LOAD16_U : OP_I32_LOAD16_S, 1, 0); break;
@@ -79,7 +79,7 @@ void gen_store(const Type *type) {
 static void gen_arith(enum ExprKind kind, const Type *type) {
   assert(is_number(type) || ptr_or_array(type));
   int index = 0;
-  bool is_unsigned = is_fixnum(type) && type->fixnum.is_unsigned;
+  bool u = is_unsigned(type);
   if (is_flonum(type)) {
     assert(kind < EX_MOD);
     index = type->flonum.kind >= FL_DOUBLE ? 3 : 2;
@@ -103,17 +103,17 @@ static void gen_arith(enum ExprKind kind, const Type *type) {
   };
 
   assert(EX_ADD <= kind && kind <= EX_RSHIFT);
-  assert(kOpTable[is_unsigned][index][kind - EX_ADD] != OP_NOP);
-  ADD_CODE(kOpTable[is_unsigned][index][kind - EX_ADD]);
+  assert(kOpTable[u][index][kind - EX_ADD] != OP_NOP);
+  ADD_CODE(kOpTable[u][index][kind - EX_ADD]);
 }
 
 static void gen_cast_to_i(const Type *dst, Type *src) {
   switch (src->kind) {
   case TY_FIXNUM: case TY_PTR: case TY_FUNC:
     {
       size_t d = type_size(dst), s = type_size(src);
-      bool du = dst->kind != TY_FIXNUM || dst->fixnum.is_unsigned;
-      bool su = src->kind != TY_FIXNUM || src->fixnum.is_unsigned;
+      bool du = dst->kind == TY_FUNC || is_unsigned(dst);
+      bool su = src->kind == TY_FUNC || is_unsigned(src);
       enum { I64TO32 = 1, I32TO64 = 2 };
       switch ((d > I32_SIZE ? 2 : 0) + (s > I32_SIZE ? 1 : 0)) {
       case I64TO32: ADD_CODE(OP_I32_WRAP_I64); break;
@@ -153,7 +153,7 @@ static void gen_cast_to_i(const Type *dst, Type *src) {
       };
       int d = type_size(dst);
       int index = (d > I32_SIZE ? 2 : 0) + (src->flonum.kind >= FL_DOUBLE ? 1 : 0);
-      bool du = !is_fixnum(dst) || dst->fixnum.is_unsigned;
+      bool du = is_unsigned(dst);
       ADD_CODE(OpTable[du][index]);
     }
     break;
@@ -171,7 +171,7 @@ static void gen_cast_to_f(const Type *dst, Type *src) {
       };
       int s = type_size(src);
       int index = (dst->flonum.kind >= FL_DOUBLE ? 2 : 0) + (s > I32_SIZE ? 1 : 0);
-      bool su = !is_fixnum(src) || src->fixnum.is_unsigned;
+      bool su = is_unsigned(src);
       ADD_CODE(OpTable[su][index]);
     }
     break;