artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mescc: Tinycc support: char*[] in function.

Browse source 
* module/language/c99/compiler.mes (c99-input->full-ast): Add NULL.
  (decl->info): Support char* [] in function scope.
* scaffold/tests/71-struct-array.c (test) Test it.
This commit is contained in:
Jan Nieuwenhuizen 2017-07-21 00:09:18 +02:00
parent e8023cd2ef
commit 3687740b64
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
module/language/c99/compiler.mes
View file

@ -71,6 +71,7 @@
"INT_MIN=-2147483648"
"INT_MAX=2147483647"
"NULL=0"
"FIXED_PRIMITIVES=1"
@ -1653,15 +1654,34 @@
((decl (decl-spec-list (type-spec ,type)) (init-declr-list (init-declr (ptr-declr (pointer) (array-of (ident ,name))) (initzer (initzer-list . ,initzers)))))
(let* ((type (decl->ast-type type))
(entries (filter identity (append-map (initzer->globals globals) initzers)))
(global-names (map car globals))
(entries (filter (lambda (g) (and g (not (member (car g) global-names)))) entries))
(globals (append globals entries))
(entry-size 4)
(size (* (length entries) entry-size))
(initzers (map (initzer->non-const info) initzers)))
(if (.function info)
(error "TODO: <type> x[] = {};" o)
(let* ((local (car (add-local locals name type -1)))
(count (length initzers))
(local (make-local-entry name type -1 (+ (local:id (cdr local)) -1 (1+ count))))
(locals (cons local locals))
(info (clone info #:locals locals))
(info (clone info #:globals globals))
(empty (clone info #:text '())))
(let loop ((index 0) (initzers initzers) (info info))
(if (null? initzers) info
(let ((offset (* index 4))
(initzer (car initzers)))
(loop (1+ index) (cdr initzers)
(clone info #:text
(append
(.text info)
((ident->accu info) name)
(wrap-as (append (i386:accu->base)))
(.text ((expr->accu empty) initzer))
(wrap-as (i386:accu->base-address+n offset)))))))))
(let* ((global (make-global-entry name type -2 (append-map (initzer->data info) initzers)))
(global-names (map car globals))
(entries (filter (lambda (g) (and g (not (member (car g) global-names)))) entries))
(globals (append globals entries (list global))))
(globals (append globals (list global))))
(clone info #:globals globals)))))
((decl (decl-spec-list (type-spec ,type)) (init-declr-list (init-declr ,init . ,initzer)))

4
scaffold/tests/71-struct-array.c
View file

@ -58,5 +58,9 @@ test ()
printf ("punter eentje: %d\n", g->bar[0]);
printf ("punter tweetje: %d\n", g->bar[1]);
char *strings[] = { "one\n", "two\n", "three\n", NULL };
char **p = strings;
while (*p) puts (*p++);
return 0;
}