shithub: scc

Info  •  Files  •  Log  •  Branches

Remove reference count in types

In the types representation we were using a reference counting system,
but difference instances of the same object (different memory positions)
could exits, so having the reference system was paintful, and the
utility were reduced because types were shared only between variables
defined in the same list declaration, that is not the usual case. This
patch removes the reference count system and  always duplicate the types
in declaration lists.

--- a/decl.c

+++ b/decl.c

@@ -89,7 +89,7 @@

 	if (yytoken == IDEN) {

 		sym = namespace(NS_STRUCT, -1);

-		(sym->ctype = tp)->refcnt++;

+		sym->ctype = tp;

 		next();

 	}

 	if (nr_structs == NR_MAXSTRUCTS)

@@ -132,9 +132,10 @@

 				      cursym->name);

 			}

 		}

-		(cursym->ctype = tp)->refcnt++;

+		cursym->ctype = tp;

 	} while (accept(','));

+	delctype(base);

 	expect(';');

 	return tp;

 }

@@ -143,9 +144,9 @@

 struct_spec(register struct ctype *tp)

 {

 	new_struct(tp);

+

 	if (!accept('{'))

 		return tp;

-

 	if (!tp->forward)

 		error("struct/union already defined");

@@ -152,8 +153,8 @@

 	do

 		struct_dcl(tp->ns);

 	while (!accept('}'));

-	tp->forward = 0;

+	tp->forward = 0;

 	return tp;

 }

@@ -174,7 +175,8 @@

 			break;

 		expect(IDEN);

-		((sym = namespace(NS_IDEN, 1))->ctype = tp)->refcnt++;

+		sym = namespace(NS_IDEN, 1);

+		sym->ctype = tp;

 		if (accept('=')) {

 			expect(CONSTANT);

 			val = yyval.sym->val;

@@ -223,7 +225,7 @@

 					if (!tp)

 						tp = newctype();

 					tp->type = TYPEDEF;

-					(tp->base = sym->ctype)->refcnt++;

+					tp->base = sym->ctype;

 					break;

 				}

 			}

@@ -311,25 +313,25 @@

 	c.tree = NULL;

 	do {

-		struct node *sp, *np;

+		struct node *np;

 		register struct ctype *tp;

 		declarator(base, base->c_typedef ? NS_TYPEDEF : NS_IDEN);

-		tp = decl_type(base);

-		(cursym->ctype = tp)->refcnt++;

+		tp = cursym->ctype = decl_type(base);

 		if ((tp->type == STRUCT || tp->type == UNION) && tp->forward)

 			error("declaration of variable with incomplete type");

-		sp = nodesym(cursym);

+		np = nodesym(cursym);

 		if (tp->type == FTN && yytoken == '{') {

-			np  = node(ODEF, sp, function(cursym));

+			np  = node(ODEF, np, function(cursym));

 			return addstmt(&c, np);

 		}

-		np = node(ODEF, sp, accept('=') ? initializer(tp) : NULL);

+		np = node(ODEF, np, accept('=') ? initializer(tp) : NULL);

 		addstmt(&c, np);

 	} while (accept(','));

-	expect(';');

+	delctype(base);

+	expect(';');

 	return c.tree;

 }

@@ -336,24 +338,24 @@

 struct node *

 decl(void)

 {

-	register struct ctype *tp;

+	register struct ctype *base;

-repeat: if (!(tp = spec())) {

+repeat: if (!(base = spec())) {

 		if (curctx != CTX_OUTER || yytoken != IDEN)

 			return NULL;

-		tp = newctype();

-		tp->type = INT;

+		base = newctype();

+		base->type = INT;

 		warn(options.implicit,

 		     "data definition has no type or storage class");

 	} else if (accept(';')) {

-		register unsigned char type = tp->type;

+		register unsigned char type = base->type;

 		if (type == STRUCT || type == UNION || type == ENUM) {

-			if (HAS_STORAGE(tp) || HAS_QUALIF(tp)) {

+			if (HAS_STORAGE(base) || HAS_QUALIF(base)) {

 				warn(options.useless,

 				     "useless storage class specifier in empty declaration");

 			}

-			if (!tp->sym && type != ENUM) {

+			if (!base->sym && type != ENUM) {

 				warn(options.useless,

 				     "unnamed struct/union that defines no instances");

 			}

@@ -361,10 +363,10 @@

 			warn(options.useless,

 			     "useless type name in empty declaration");

 		}

-		delctype(tp);

+		delctype(base);

 		goto repeat;

 	}

-	return listdcl(tp);

+	return listdcl(base);

 }

 void

--- a/symbol.h

+++ b/symbol.h

@@ -41,7 +41,6 @@

 		};

 	};

 	struct ctype *base;

-	unsigned char refcnt;

 };

 struct symbol {

--- a/types.c

+++ b/types.c

@@ -17,7 +17,7 @@

 {

 	register struct ctype *tp = xcalloc(sizeof(*tp), 1);

-	tp->forward = tp->refcnt = 1;

+	tp->forward = 1;

 	return tp;

 }

@@ -26,11 +26,9 @@

 {

 	if (!tp)

 		return;

-	if (--tp->refcnt == 0) {

-		if (tp->base)

-			delctype(tp->base);

-		free(tp);

-	}

+	if (tp->base)

+		delctype(tp->base);

+	free(tp);

 }

 static struct ctype *

@@ -45,7 +43,6 @@

 	case PTR: case FTN: {

 		register struct ctype *aux = tp;

-		++tp->refcnt;

 		tp = newctype();

 		tp->type = op;

 		tp->base = aux;

@@ -78,9 +75,12 @@

 struct ctype *

 decl_type(struct ctype *tp)

 {

+	struct ctype *new = xmalloc(sizeof(*new));

+	*new = *tp;

+

 	while (stackp != stack)

-		tp = mktype(tp, *--stackp);

-	return tp;

+		new = mktype(new, *--stackp);

+	return new;

 }

 struct ctype *