andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mescc: Refactor type system: struct/enum fields: (name . <type>). 

* module/language/c99/compiler.mes (struct-field): Refactor.
  (field:name): Update.
  (field:pointer): Update.
  (field:size): Update.
  (field:type): Remove.
  (->size): New function.
This commit is contained in:
Jan Nieuwenhuizen 2018-05-10 17:11:21 +02:00
parent b75dd7eca2
commit 1b4a994b6d
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
2 changed files with 91 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
module/language/c99/compiler.mes
View File

@ -138,10 +138,13 @@
(cons `(tag ,name) (make-type 'enum 4 fields))) (cons `(tag ,name) (make-type 'enum 4 fields)))
(define (struct->type-entry name fields) (define (struct->type-entry name fields)
(cons `(tag ,name) (make-type 'struct (apply + (map field:size fields)) fields))) (stderr "struct->type-entry name=~s fields=~s\n" name fields)
(let ((size (apply + (map (compose ->size cdr) fields))))
(cons `(tag ,name) (make-type 'struct size fields))))
(define (union->type-entry name fields) (define (union->type-entry name fields)
(cons `(tag ,name) (make-type 'union (apply + (map field:size fields)) fields))) (let ((size (apply max (map (compose ->size cdr) fields))))
(cons `(tag ,name) (make-type 'union size fields))))
(define i386:type-alist (define i386:type-alist
`(("char" . ,(make-type 'builtin 1 #f)) `(("char" . ,(make-type 'builtin 1 #f))
@ -176,33 +179,28 @@
(pmatch o (pmatch o
((struct (,name ,type ,size ,pointer) . ,rest) name) ((struct (,name ,type ,size ,pointer) . ,rest) name)
((union (,name ,type ,size ,pointer) . ,rest) name) ((union (,name ,type ,size ,pointer) . ,rest) name)
((,name ,type ,size ,pointer) name) ((,name . ,type) name)
(_ (error "field:name not supported:" o)))) (_ (error "field:name not supported:" o))))
(define (field:pointer o) (define (field:pointer o)
(pmatch o (pmatch o
((struct (,name ,type ,size ,pointer) . ,rest) pointer) ((struct (,name ,type ,size ,pointer) . ,rest) pointer)
((union (,name ,type ,size ,pointer) . ,rest) pointer) ((union (,name ,type ,size ,pointer) . ,rest) pointer)
((,name ,type ,size ,pointer) pointer) ((,name . ,type) (->rank type))
(_ (error "field:name not supported:" o)))) (_ (error "field:pointer not supported:" o))))
(define (field:size o) (define (field:size o)
(pmatch o (pmatch o
((struct . ,fields) (apply + (map field:size fields))) ((struct . ,fields) (apply + (map field:size fields)))
((union . ,fields) (apply max (map field:size fields))) ((union . ,fields) (apply max (map field:size fields)))
((,name ,type ,size ,pointer) size) ((,name . ,type) (->size type))
(_ (error (format #f "field:size: ~s\n" o))))) (_ (error (format #f "field:size: ~s\n" o)))))
(define (struct:size o)
(field:size (cons 'struct (type:description o)))) ;;FIXME
(define (field:type o)
(pmatch o
((,name ,type ,size ,pointer) type)
(_ (error (format #f "field:type: ~s\n" o)))))
(define (ast->type info o) (define (ast->type info o)
(-><type> (ast-><type> o info))) (let ((type (-><type> (ast-><type> o info))))
(cond ((type? type) type)
((equal? type o) o)
(else (ast->type info type)))))
(define (get-type o info) (define (get-type o info)
(let ((t (assoc-ref (.types info) o))) (let ((t (assoc-ref (.types info) o)))
@ -211,7 +209,6 @@
(_ t)))) (_ t))))
(define (ast-><type> o info) (define (ast-><type> o info)
(stderr "ast-><type> o=~s\n" o)
(pmatch o (pmatch o
(,t (guard (type? t)) t) (,t (guard (type? t)) t)
(,p (guard (pointer? p)) p) (,p (guard (pointer? p)) p)
@ -341,8 +338,8 @@
(if (null? fields) (error (format #f "no such field: ~a in ~s" field struct)) (if (null? fields) (error (format #f "no such field: ~a in ~s" field struct))
(let ((f (car fields))) (let ((f (car fields)))
(cond ((equal? (car f) field) f) (cond ((equal? (car f) field) f)
((and (memq (car f) '(struct union)) ((and (memq (car f) '(struct union)) (type? (cdr f)))
(find (lambda (x) (equal? (car x) field)) (cdr f)))) (find (lambda (x) (equal? (car x) field)) (type:description (cdr f))))
(else (loop (cdr fields))))))))) (else (loop (cdr fields)))))))))
(define (field-offset info struct field) (define (field-offset info struct field)
@ -354,15 +351,17 @@
(if (null? fields) (error (format #f "no such field: ~a in ~s" field struct)) (if (null? fields) (error (format #f "no such field: ~a in ~s" field struct))
(let ((f (car fields))) (let ((f (car fields)))
(cond ((equal? (car f) field) offset) (cond ((equal? (car f) field) offset)
((and (eq? (car f) 'struct) ((and (eq? (car f) 'struct) (type? (cdr f)))
(find (lambda (x) (equal? (car x) field)) (cdr f)) (let ((fields (type:description (cdr f))))
(find (lambda (x) (equal? (car x) field)) fields)
(apply + (cons offset (apply + (cons offset
(map field:size (map field:size
(member field (reverse (cdr f)) (member field (reverse fields)
(lambda (a b) (lambda (a b)
(equal? a (car b) field)))))))) (equal? a (car b) field))))))))
((and (eq? (car f) 'union) ((and (eq? (car f) 'union) (type? (cdr f)))
(find (lambda (x) (equal? (car x) field)) (cdr f)) (let ((fields (type:description (cdr f))))
(find (lambda (x) (equal? (car x) field)) fields)
offset)) offset))
(else (loop (cdr fields) (+ offset (field:size f)))))))))))) (else (loop (cdr fields) (+ offset (field:size f))))))))))))
@ -379,16 +378,16 @@
(define (field-type info struct field) (define (field-type info struct field)
(let ((field (field-field info struct field))) (let ((field (field-field info struct field)))
(field:type field))) (cdr field)))
(define (struct->fields o) (define (struct->fields o)
(pmatch o (pmatch o
(_ (guard (and (type? o) (eq? (type:type o) 'struct))) (_ (guard (and (type? o) (eq? (type:type o) 'struct)))
(append-map struct->fields (type:description o))) (append-map struct->fields (type:description o)))
(_ (guard (and (type? o) (eq? (type:type o) 'union))) (_ (guard (and (type? o) (eq? (type:type o) 'union)))
(struct->fields (car (type:description o)))) (append-map struct->fields (type:description o)))
((struct . ,fields) ((struct . ,type) (struct->fields type))
(append-map struct->fields fields)) ((union . ,type) (struct->fields type))
(_ (list o)))) (_ (list o))))
(define (byte->hex.m1 o) (define (byte->hex.m1 o)
@ -984,10 +983,10 @@
((d-sel ,field ,struct) ((d-sel ,field ,struct)
(let* ((info (expr->accu* o info)) (let* ((info (expr->accu* o info))
(info (append-text info (ast->comment o))) (info (append-text info (ast->comment o)))
(ptr (expr->rank info o)) (type (ast-><type> o info))
(size (if (= ptr 0) (ast-type->size info o) (size (->size type))
4))) (array? (c-array? type)))
(if (or (= -2 ptr) (= -1 ptr)) info (if array? info
(append-text info (wrap-as (case size (append-text info (wrap-as (case size
((1) (i386:byte-mem->accu)) ((1) (i386:byte-mem->accu))
((2) (i386:word-mem->accu)) ((2) (i386:word-mem->accu))
@ -997,10 +996,10 @@
((i-sel ,field ,struct) ((i-sel ,field ,struct)
(let* ((info (expr->accu* o info)) (let* ((info (expr->accu* o info))
(info (append-text info (ast->comment o))) (info (append-text info (ast->comment o)))
(ptr (expr->rank info o)) (type (ast-><type> o info))
(size (if (= ptr 0) (ast-type->size info o) (size (->size type))
4))) (array? (c-array? type)))
(if (or (= -2 ptr) (= ptr -1)) info (if array? info
(append-text info (wrap-as (case size (append-text info (wrap-as (case size
((1) (i386:byte-mem->accu)) ((1) (i386:byte-mem->accu))
((2) (i386:word-mem->accu)) ((2) (i386:word-mem->accu))
@ -1495,75 +1494,53 @@
(pmatch o (pmatch o
((eq ,a ,b) (eq? (expr->number info a) (expr->number info b))))) ((eq ,a ,b) (eq? (expr->number info a) (expr->number info b)))))
(define (struct-field info) (define (struct-field info)
(lambda (o) (lambda (o)
(pmatch o (pmatch o
((comp-decl (decl-spec-list (type-spec (enum-ref (ident ,type)))) ((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ident ,name))))
(comp-declr-list (comp-declr (ident ,name)))) (list (cons name (ast-><type> type info))))
(list (list name `(tag ,type) 4 0))) ((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ptr-declr ,pointer (ident ,name)))))
((comp-decl (decl-spec-list (type-spec (fixed-type ,type))) (comp-declr-list (comp-declr (ident ,name)))) (let ((rank (pointer->ptr pointer)))
(list (list name type (ast-type->size info type) 0))) (list (cons name (rank+= (ast-><type> type info) rank)))))
((comp-decl (decl-spec-list (type-spec (typename ,type))) (comp-declr-list (comp-declr (ident ,name)))) ((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ftn-declr (scope (ptr-declr ,pointer (ident ,name))) _))))
(list (list name type (ast-type->size info type) 0))) (let ((rank (pointer->ptr pointer)))
((comp-decl (decl-spec-list (type-spec (typename ,type))) (comp-declr-list (comp-declr (ptr-declr (pointer (pointer)) (ident ,name))))) (list (cons name (rank+= (ast-><type> type info) rank)))))
(list (list name type 4 2))) ((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ptr-declr ,pointer (array-of (ident ,name) ,count)))))
((comp-decl (decl-spec-list (type-spec (fixed-type ,type))) (comp-declr-list (comp-declr (ftn-declr (scope (ptr-declr (pointer) (ident ,name))) (param-list . ,param-list))))) (let ((rank (pointer->ptr pointer))
(list (list name type 4 1)))
((comp-decl (decl-spec-list (type-spec (fixed-type ,type))) (comp-declr-list (comp-declr (ptr-declr (pointer) (ident ,name)))))
(list (list name type 4 1)))
((comp-decl (decl-spec-list (type-spec (fixed-type ,type))) (comp-declr-list (comp-declr (ptr-declr (pointer (pointer)) (ident ,name)))))
(list (list name type 4 2)))
((comp-decl (decl-spec-list (type-spec (void))) (comp-declr-list (comp-declr (ptr-declr (pointer (pointer)) (ident ,name)))))
(list (list name "void" 4 2)))
((comp-decl (decl-spec-list (type-spec (void))) (comp-declr-list (comp-declr (ptr-declr (pointer) (ident ,name)))))
(list (list name "void" 4 1)))
((comp-decl (decl-spec-list (type-spec (void))) (comp-declr-list (comp-declr (ftn-declr (scope (ptr-declr (pointer) (ident ,name))) (param-list . ,param-list)))))
(list (list name "void" 4 1)))
((comp-decl (decl-spec-list (type-spec (typename ,type))) (comp-declr-list (comp-declr (ptr-declr (pointer) (ident ,name)))))
(list (list name type 4 1)))
;; FIXME: array: -1,-2-3, name??
((comp-decl (decl-spec-list (type-spec (typename ,type))) (comp-declr-list (comp-declr (ptr-declr (pointer) (array-of (ident ,name) ,count)))))
(let ((size 4)
(count (expr->number info count))) (count (expr->number info count)))
(list (list name type (* count size) -2)))) (list (cons name (make-c-array (rank+= type rank) count)))))
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (array-of (ident ,name) ,count)))) ((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (array-of (ident ,name) ,count))))
(let* ((type (if (type? type) type (let ((count (expr->number info count)))
(ast->type info type))) (list (cons name (make-c-array (ast-><type> type info) count)))))
(size (ast-type->size info type))
(count (expr->number info count)))
(list (list name type (* count size) -1))))
((comp-decl (decl-spec-list (type-spec (struct-ref (ident ,type)))) (comp-declr-list (comp-declr (ptr-declr (pointer (pointer)) (ident ,name)))))
(list (list name `(tag ,type) 4 2)))
((comp-decl (decl-spec-list (type-spec (struct-ref (ident ,type)))) (comp-declr-list (comp-declr (ptr-declr (pointer) (ident ,name)))))
(list (list name `(tag ,type) 4 1)))
((comp-decl (decl-spec-list (type-spec (struct-ref (ident ,type)))) (comp-declr-list (comp-declr (ident ,name))))
(let ((size (ast-type->size info `(tag ,type))))
(list (list name `(tag ,type) size 0))))
((comp-decl (decl-spec-list (type-spec (struct-def (field-list . ,fields))))) ((comp-decl (decl-spec-list (type-spec (struct-def (field-list . ,fields)))))
(list `(struct ,@(append-map (struct-field info) fields)))) (let ((fields (append-map (struct-field info) fields)))
(list (cons 'struct (make-type 'struct (apply + (map field:size fields)) fields)))))
((comp-decl (decl-spec-list (type-spec (union-ref (ident ,type)))) (comp-declr-list (comp-declr (ident ,name))))
(let ((size (ast-type->size info `(tag ,type))))
(list (list name `(tag ,type) size 0))))
((comp-decl (decl-spec-list (type-spec (union-def (field-list . ,fields))))) ((comp-decl (decl-spec-list (type-spec (union-def (field-list . ,fields)))))
(list `(union ,@(append-map (struct-field info) fields)))) (let ((fields (append-map (struct-field info) fields)))
(list (cons 'union (make-type 'union (apply + (map field:size fields)) fields)))))
((comp-decl (decl-spec-list ,type) (comp-declr-list . ,decls)) (guard (pair? (cdr decls))) ((comp-decl (decl-spec-list ,type) (comp-declr-list . ,decls))
(let loop ((decls decls)) (append-map (lambda (o)
(if (null? decls) '() ((struct-field info) `(comp-decl (decl-spec-list ,type) (comp-declr-list ,o))))
(append ((struct-field info) `(comp-decl (decl-spec-list ,type) (comp-declr-list ,(car decls)))) decls))
(loop (cdr decls))))))
(_ (error "struct-field: not supported: " o))))) (_ (error "struct-field: not supported: " o)))))
(define (->size o)
(cond ((and (type? o) (eq? (type:type o) 'struct))
(apply + (map (compose ->size cdr) (struct->fields o))))
((and (type? o) (eq? (type:type o) 'union))
(apply max (map (compose ->size cdr) (struct->fields o))))
((type? o) (type:size o))
((pointer? o) %pointer-size)
((c-array? o) %pointer-size)
((local? o) ((compose ->size local:type) o))
((global? o) ((compose ->size global:type) o))
;; FIXME
;; (#t
;; (stderr "o=~s\n" o)
;; (format (current-error-port) "->size: not a <type>: ~s\n" o)
;; 4)
(else (error "->size>: not a <type>:" o))))
(define (local-var? o) ;; formals < 0, locals > 0 (define (local-var? o) ;; formals < 0, locals > 0
(positive? (local:id o))) (positive? (local:id o)))
@ -1955,7 +1932,7 @@
(= -1 pointer)) (= -1 pointer))
(structured-type? type))) (structured-type? type)))
(size (or (and (zero? pointer) (type? type) (type:size type)) (size (or (and (zero? pointer) (type? type) (type:size type))
(and struct? (and=> (ast->type info type) struct:size)) (and struct? (and=> (ast->type info type) ->size))
4)) 4))
(local (if (not array) local (local (if (not array) local
(make-local-entry name type pointer array (+ (local:id (cdr local)) -1 (quotient (+ (* array size) 3) 4))))) (make-local-entry name type pointer array (+ (local:id (cdr local)) -1 (quotient (+ (* array size) 3) 4)))))

17
module/language/c99/info.scm
View File

@ -101,6 +101,7 @@
->rank ->rank
rank-- rank--
rank++ rank++
rank+=
structured-type?)) structured-type?))
(cond-expand (cond-expand
@ -220,21 +221,27 @@
(define (->rank o) (define (->rank o)
(cond ((type? o) 0) (cond ((type? o) 0)
((pointer? o) (pointer:rank o)) ((pointer? o) (pointer:rank o))
((c-array? o) ((compose ->rank c-array:type) o)) ((c-array? o) (1+ ((compose ->rank c-array:type) o)))
((local? o) ((compose ->rank local:type) o))
((global? o) ((compose ->rank global:type) o))
;; FIXME ;; FIXME
(#t (#t
(format (current-error-port) "->rank--: not a type: ~s\n" o) (format (current-error-port) "->rank: not a type: ~s\n" o)
0) 0)
(else (error "->rank: not a <type>:" o)))) (else (error "->rank: not a <type>:" o))))
(define (rank-- o) (define (rank-- o)
(cond ((and (pointer? o) (zero? (pointer:rank o))) (pointer:type o)) (cond ((and (pointer? o) (= (pointer:rank o) 1)) (pointer:type o))
((pointer? o) (set-field o (pointer:rank) (1- (pointer:rank o)))) ((pointer? o) (set-field o (pointer:rank) (1- (pointer:rank o))))
((c-array? o) (c-array:type o))
;; FIXME ;; FIXME
(#t (format (current-error-port) "rank--: not a pointer: ~s\n" o) (#t (format (current-error-port) "rank--: not a pointer: ~s\n" o)
o) o)
(else (error "rank--: not a pointer" o)))) (else (error "rank--: not a pointer" o))))
(define (rank+= o i)
(cond ((pointer? o) (set-field o (pointer:rank) (+ i (pointer:rank o))))
(else (make-pointer o i))))
(define (rank++ o) (define (rank++ o)
(cond ((pointer? o) (set-field o (pointer:rank) (1+ (pointer:rank o)))) (rank+= o 1))
(else (make-pointer o 1))))