Keep track of built-in kind in declaration

Also, populate filescope with builtins outside of main.

1 files changed, 15 insertions, 8 deletions

diff --git a/decl.h b/decl.h
index 0fb081b..5b8b83d 100644
--- a/decl.h
+++ b/decl.h
@@ -12,27 +12,34 @@ enum linkage {
 	LINKEXTERN,
 };
 
+enum builtinkind {
+	BUILTINVALIST,
+	BUILTINVASTART,
+	BUILTINVAARG,
+	BUILTINVACOPY,
+	BUILTINVAEND,
+	BUILTINOFFSETOF,
+	BUILTINALLOCA,
+};
+
 struct declaration {
 	enum declarationkind kind;
 	enum linkage linkage;
 	struct type *type;
 	struct value *value;
+
+	/* objects and functions */
 	struct list link;
 	int align;  /* may be more strict than type requires */
 	_Bool tentative, defined;
+
+	/* built-ins */
+	enum builtinkind builtin;
 };
 
 struct scope;
 struct function;
 
-extern struct declaration builtinvalist;
-extern struct declaration builtinvastart;
-extern struct declaration builtinvaarg;
-extern struct declaration builtinvacopy;
-extern struct declaration builtinvaend;
-extern struct declaration builtinoffsetof;
-extern struct declaration builtinalloca;
-
 struct declaration *mkdecl(enum declarationkind, struct type *, enum linkage);
 _Bool decl(struct scope *, struct function *);
 struct type *typename(struct scope *);