2016-12-31 08:03:07 +00:00
|
|
|
|
;;; -*-scheme-*-
|
|
|
|
|
|
|
|
|
|
;;; Mes --- Maxwell Equations of Software
|
2017-11-21 18:22:26 +00:00
|
|
|
|
;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
2016-12-31 08:03:07 +00:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of Mes.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Mes is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Mes is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with Mes. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; compiler.mes produces an i386 binary from the C produced by
|
|
|
|
|
;;; Nyacc c99.
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(cond-expand
|
2017-06-11 11:11:40 +00:00
|
|
|
|
(guile-2)
|
2017-04-02 09:55:37 +00:00
|
|
|
|
(guile)
|
|
|
|
|
(mes
|
mescc: Use records for Guile: preparation.
* module/language/c99/info.mes: New file.
* module/mes/M1.mes: Use it.
* scripts/mescc.mes: Use it.
* module/language/c99/compiler.mes: Use it. (<info>, <types>,
<constants>, <functions>, <globals>, <locals>, <function>, <text>,
<break>, <continue>, make, info?, .info, .types, .constants,
.functions, .globals, .locals, .function, .text, .break, .continue):
Remove.
* module/language/c99/info.scm: New file.
* module/language/c99/compiler.scm: Use it.
* guile/mescc.scm: Use it.
* module/mes/M1.scm: Use it.
2017-07-14 18:42:26 +00:00
|
|
|
|
(mes-use-module (srfi srfi-1))
|
2017-06-20 17:06:19 +00:00
|
|
|
|
(mes-use-module (srfi srfi-26))
|
2017-04-02 15:01:22 +00:00
|
|
|
|
(mes-use-module (mes pmatch))
|
2017-04-02 09:55:37 +00:00
|
|
|
|
(mes-use-module (nyacc lang c99 parser))
|
2017-06-11 11:11:40 +00:00
|
|
|
|
(mes-use-module (nyacc lang c99 pprint))
|
mescc: Remove ELF creation, handled by hex2 now.
* module/language/c99/compiler.scm (make-global, global:type,
global:pointer, global:value): Move from elf-util.mes
* module/mes/as.mes: New file.
* module/mes/as-i386.mes: Use it.
* module/mes/as-i386.scm: Use it.
* module/mes/elf-util.mes: Remove.
* module/mes/elf.mes (elf32-addr, elf32-half, elf32-off, elf32-word,
make-elf, write-any, object->elf): Remove
(hex2->elf): New function with dummy implementation.
* module/mes/elf.scm: Update exports.
* module/mes/hex2.mes (object->elf): New function.
* module/mes/hex2.scm: Export it.
2017-06-25 07:26:25 +00:00
|
|
|
|
(mes-use-module (mes as))
|
2017-04-02 10:29:09 +00:00
|
|
|
|
(mes-use-module (mes as-i386))
|
2017-07-02 14:25:14 +00:00
|
|
|
|
(mes-use-module (mes M1))
|
mescc: Use records for Guile: preparation.
* module/language/c99/info.mes: New file.
* module/mes/M1.mes: Use it.
* scripts/mescc.mes: Use it.
* module/language/c99/compiler.mes: Use it. (<info>, <types>,
<constants>, <functions>, <globals>, <locals>, <function>, <text>,
<break>, <continue>, make, info?, .info, .types, .constants,
.functions, .globals, .locals, .function, .text, .break, .continue):
Remove.
* module/language/c99/info.scm: New file.
* module/language/c99/compiler.scm: Use it.
* guile/mescc.scm: Use it.
* module/mes/M1.scm: Use it.
2017-07-14 18:42:26 +00:00
|
|
|
|
(mes-use-module (mes optargs))
|
|
|
|
|
(mes-use-module (language c99 info))))
|
2017-04-02 09:55:37 +00:00
|
|
|
|
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
(define (logf port string . rest)
|
|
|
|
|
(apply format (cons* port string rest))
|
|
|
|
|
(force-output port)
|
|
|
|
|
#t)
|
|
|
|
|
|
|
|
|
|
(define (stderr string . rest)
|
|
|
|
|
(apply logf (cons* (current-error-port) string rest)))
|
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (pke . stuff)
|
|
|
|
|
(newline (current-error-port))
|
|
|
|
|
(display ";;; " (current-error-port))
|
|
|
|
|
(write stuff (current-error-port))
|
|
|
|
|
(newline (current-error-port))
|
|
|
|
|
(car (last-pair stuff)))
|
|
|
|
|
|
2017-07-26 13:42:44 +00:00
|
|
|
|
(define %prefix (if (string-prefix? "@PREFIX" "@PREFIX@") (or (getenv "PREFIX") "") "@PREFIX@"))
|
2017-04-12 19:27:59 +00:00
|
|
|
|
|
|
|
|
|
(define mes? (pair? (current-module)))
|
|
|
|
|
|
2018-05-04 11:58:27 +00:00
|
|
|
|
(define %int-size 4)
|
|
|
|
|
(define %pointer-size %int-size)
|
|
|
|
|
|
2017-05-25 17:48:26 +00:00
|
|
|
|
(define* (c99-input->full-ast #:key (defines '()) (includes '()))
|
2018-01-02 20:35:55 +00:00
|
|
|
|
(let ((sys-include (if (equal? %prefix "") "include" (string-append %prefix "/share/include"))))
|
2017-05-23 05:16:08 +00:00
|
|
|
|
(parse-c99
|
2018-01-02 20:35:55 +00:00
|
|
|
|
#:inc-dirs (append includes (cons* sys-include "include" "lib" (or (and=> (getenv "C_INCLUDE_PATH") (cut string-split <> #\:)) '())))
|
2017-05-23 05:16:08 +00:00
|
|
|
|
#:cpp-defs `(
|
2017-07-29 08:45:16 +00:00
|
|
|
|
"NULL=0"
|
2017-08-04 09:33:34 +00:00
|
|
|
|
"__linux__=1"
|
2017-07-28 06:07:41 +00:00
|
|
|
|
"__i386__=1"
|
2017-05-23 05:16:08 +00:00
|
|
|
|
"POSIX=0"
|
|
|
|
|
"_POSIX_SOURCE=0"
|
|
|
|
|
"__MESC__=1"
|
|
|
|
|
,(if mes? "__MESC_MES__=1" "__MESC_MES__=0")
|
2017-07-26 13:42:44 +00:00
|
|
|
|
,@defines)
|
2017-05-23 05:16:08 +00:00
|
|
|
|
#:mode 'code)))
|
2016-12-31 08:03:07 +00:00
|
|
|
|
|
2017-05-25 17:48:26 +00:00
|
|
|
|
(define (ast-strip-comment o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((comment . ,comment) #f)
|
|
|
|
|
(((comment . ,comment) . ,t) (filter-map ast-strip-comment t))
|
|
|
|
|
(((comment . ,comment) . ,cdr) cdr)
|
|
|
|
|
((,car . (comment . ,comment)) car)
|
|
|
|
|
((,h . ,t) (if (list? o) (filter-map ast-strip-comment o)
|
|
|
|
|
(cons (ast-strip-comment h) (ast-strip-comment t))))
|
|
|
|
|
(_ o)))
|
|
|
|
|
|
2017-06-02 11:12:56 +00:00
|
|
|
|
(define (ast-strip-const o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((type-qual ,qual) (if (equal? qual "const") #f o))
|
2017-11-19 15:46:43 +00:00
|
|
|
|
((pointer (type-qual-list (type-qual ,qual)) . ,rest)
|
|
|
|
|
(if (equal? qual "const") `(pointer ,@rest) o))
|
|
|
|
|
((decl-spec-list (type-qual ,qual))
|
|
|
|
|
(if (equal? qual "const") #f
|
|
|
|
|
`(decl-spec-list (type-qual ,qual))))
|
2017-06-02 11:12:56 +00:00
|
|
|
|
((decl-spec-list (type-qual ,qual) . ,rest)
|
|
|
|
|
(if (equal? qual "const") `(decl-spec-list ,@rest)
|
|
|
|
|
`(decl-spec-list (type-qual ,qual) ,@(map ast-strip-const rest))))
|
2017-11-19 15:46:43 +00:00
|
|
|
|
((decl-spec-list (type-qual-list (type-qual ,qual)) . ,rest)
|
|
|
|
|
(if (equal? qual "const") `(decl-spec-list ,@rest)
|
|
|
|
|
`(decl-spec-list (type-qual-list (type-qual ,qual)) ,@(map ast-strip-const rest))))
|
2017-06-02 11:12:56 +00:00
|
|
|
|
((,h . ,t) (if (list? o) (filter-map ast-strip-const o)
|
|
|
|
|
(cons (ast-strip-const h) (ast-strip-const t))))
|
|
|
|
|
(_ o)))
|
|
|
|
|
|
2017-01-04 23:55:46 +00:00
|
|
|
|
(define (clone o . rest)
|
|
|
|
|
(cond ((info? o)
|
2017-01-10 21:44:01 +00:00
|
|
|
|
(let ((types (.types o))
|
|
|
|
|
(constants (.constants o))
|
|
|
|
|
(functions (.functions o))
|
2017-01-04 23:55:46 +00:00
|
|
|
|
(globals (.globals o))
|
|
|
|
|
(locals (.locals o))
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(statics (.statics o))
|
mescc: Beginning of expression and test template.
* scaffold/t.c: New file.
* GNUmakefile (mescc-check, t-check): New targets.
* module/language/c99/compiler.mes (write-any): Catch weirdness.
(make): Add <function> slot.
(.function): New accessor.
(clone): Handle it.
(function->info): Set it.
(ast->info): Make tests generic in if, for, while. Add goto, label,
!, ==, !=, -, &&.
* module/mes/elf-util.mes (lambda/label->list): New function.
(text->list): Use it.
(functions->text, function-prefix): New function.
(function-offset): Use it.
(label-offset): New function.
* module/mes/elf-util.scm (mes): Export them.
* module/mes/elf.mes (make-elf): Use text->list.
* module/mes/libc-i386.mes (eputs, puts): Remove.
(i386:byte-base-sub): Rename from sub-byte-base.
(i386:byte-jump-z): Rename from i386:Xjump-byte-z.
(i386:byte-mem->accu): Rename from i386:Xmem-byte->accu.
(i386:byte-mem->base): Rename from i386:Xmem-byte->base.
(i386:accu->local, i386:accu-non-zero?, i386:accu-zero?,
i386:base-sub, i386:byte-sub-base, i386:jump-c, i386:jump-cz,
i386:jump-nc, i386:jump-ncz, i386:byte-mem->base, i386:sub-base,
i386:test-accu, i386:test-base, i386:test-jump-z, i386:value->base,
i386:xor-zf): New functions.
2017-04-02 10:23:00 +00:00
|
|
|
|
(function (.function o))
|
2017-04-10 04:59:50 +00:00
|
|
|
|
(text (.text o))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(post (.post o))
|
2017-06-12 15:10:29 +00:00
|
|
|
|
(break (.break o))
|
|
|
|
|
(continue (.continue o)))
|
2017-01-04 23:55:46 +00:00
|
|
|
|
(let-keywords rest
|
|
|
|
|
#f
|
2017-01-10 21:44:01 +00:00
|
|
|
|
((types types)
|
|
|
|
|
(constants constants)
|
|
|
|
|
(functions functions)
|
2017-01-04 23:55:46 +00:00
|
|
|
|
(globals globals)
|
|
|
|
|
(locals locals)
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(statics statics)
|
mescc: Beginning of expression and test template.
* scaffold/t.c: New file.
* GNUmakefile (mescc-check, t-check): New targets.
* module/language/c99/compiler.mes (write-any): Catch weirdness.
(make): Add <function> slot.
(.function): New accessor.
(clone): Handle it.
(function->info): Set it.
(ast->info): Make tests generic in if, for, while. Add goto, label,
!, ==, !=, -, &&.
* module/mes/elf-util.mes (lambda/label->list): New function.
(text->list): Use it.
(functions->text, function-prefix): New function.
(function-offset): Use it.
(label-offset): New function.
* module/mes/elf-util.scm (mes): Export them.
* module/mes/elf.mes (make-elf): Use text->list.
* module/mes/libc-i386.mes (eputs, puts): Remove.
(i386:byte-base-sub): Rename from sub-byte-base.
(i386:byte-jump-z): Rename from i386:Xjump-byte-z.
(i386:byte-mem->accu): Rename from i386:Xmem-byte->accu.
(i386:byte-mem->base): Rename from i386:Xmem-byte->base.
(i386:accu->local, i386:accu-non-zero?, i386:accu-zero?,
i386:base-sub, i386:byte-sub-base, i386:jump-c, i386:jump-cz,
i386:jump-nc, i386:jump-ncz, i386:byte-mem->base, i386:sub-base,
i386:test-accu, i386:test-base, i386:test-jump-z, i386:value->base,
i386:xor-zf): New functions.
2017-04-02 10:23:00 +00:00
|
|
|
|
(function function)
|
2017-04-10 04:59:50 +00:00
|
|
|
|
(text text)
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(post post)
|
2017-06-12 15:10:29 +00:00
|
|
|
|
(break break)
|
|
|
|
|
(continue continue))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(make <info> #:types types #:constants constants #:functions functions #:globals globals #:locals locals #:statics statics #:function function #:text text #:post post #:break break #:continue continue))))))
|
2017-01-04 23:55:46 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (ident->constant name value)
|
|
|
|
|
(cons name value))
|
mescc: Use records for Guile: preparation.
* module/language/c99/info.mes: New file.
* module/mes/M1.mes: Use it.
* scripts/mescc.mes: Use it.
* module/language/c99/compiler.mes: Use it. (<info>, <types>,
<constants>, <functions>, <globals>, <locals>, <function>, <text>,
<break>, <continue>, make, info?, .info, .types, .constants,
.functions, .globals, .locals, .function, .text, .break, .continue):
Remove.
* module/language/c99/info.scm: New file.
* module/language/c99/compiler.scm: Use it.
* guile/mescc.scm: Use it.
* module/mes/M1.scm: Use it.
2017-07-14 18:42:26 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (enum->type-entry name fields)
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(cons `(tag ,name) (make-type 'enum 4 fields)))
|
2017-02-27 06:50:33 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (struct->type-entry name fields)
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(let ((size (apply + (map (compose ->size cdr) fields))))
|
|
|
|
|
(cons `(tag ,name) (make-type 'struct size fields))))
|
2017-02-27 06:50:33 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (union->type-entry name fields)
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(let ((size (apply max (map (compose ->size cdr) fields))))
|
|
|
|
|
(cons `(tag ,name) (make-type 'union size fields))))
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define i386:type-alist
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
`(("char" . ,(make-type 'signed 1 #f))
|
|
|
|
|
("short" . ,(make-type 'signed 2 #f))
|
|
|
|
|
("int" . ,(make-type 'signed 4 #f))
|
|
|
|
|
("long" . ,(make-type 'signed 4 #f))
|
2018-05-19 09:41:53 +00:00
|
|
|
|
("default" . ,(make-type 'signed 4 #f))
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
;;("long long" . ,(make-type 'signed 8 #f))
|
|
|
|
|
;;("long long int" . ,(make-type 'signed 8 #f))
|
2017-11-14 18:39:46 +00:00
|
|
|
|
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
("long long" . ,(make-type 'signed 4 #f)) ;; FIXME
|
|
|
|
|
("long long int" . ,(make-type 'signed 4 #f))
|
2017-11-14 18:39:46 +00:00
|
|
|
|
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
("void" . ,(make-type 'void 1 #f))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
;; FIXME sign
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
("unsigned char" . ,(make-type 'unsigned 1 #f))
|
|
|
|
|
("unsigned short" . ,(make-type 'unsigned 2 #f))
|
|
|
|
|
("unsigned short int" . ,(make-type 'unsigned 2 #f))
|
|
|
|
|
("unsigned" . ,(make-type 'unsigned 4 #f))
|
|
|
|
|
("unsigned int" . ,(make-type 'unsigned 4 #f))
|
|
|
|
|
("unsigned long" . ,(make-type 'unsigned 4 #f))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
|
|
|
|
;; ("unsigned long long" . ,(make-type 'builtin 8 #f))
|
|
|
|
|
;; ("unsigned long long int" . ,(make-type 'builtin 8 #f))
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
("unsigned long long" . ,(make-type 'unsigned 4 #f)) ;; FIXME
|
|
|
|
|
("unsigned long long int" . ,(make-type 'unsigned 4 #f))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
("float" . ,(make-type 'float 4 #f))
|
|
|
|
|
("double" . ,(make-type 'float 8 #f))
|
|
|
|
|
("long double" . ,(make-type 'float 16 #f))))
|
|
|
|
|
|
|
|
|
|
(define (signed? o)
|
|
|
|
|
(eq? ((compose type:type ->type) o) 'signed))
|
|
|
|
|
|
|
|
|
|
(define (unsigned? o)
|
|
|
|
|
(eq? ((compose type:type ->type) o) 'unsigned))
|
|
|
|
|
|
|
|
|
|
(define (->size o)
|
|
|
|
|
(cond ((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) (* (c-array:count o) ((compose ->size c-array:type) o)))
|
|
|
|
|
((local? o) ((compose ->size local:type) o))
|
|
|
|
|
((global? o) ((compose ->size global:type) o))
|
|
|
|
|
((bit-field? o) ((compose ->size bit-field:type) o))
|
|
|
|
|
((and (pair? o) (pair? (car o)) (bit-field? (cdar o))) ((compose ->size cdar) 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))))
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (ast->type o info)
|
|
|
|
|
(define (type-helper o info)
|
2018-05-11 16:53:54 +00:00
|
|
|
|
(if (getenv "MESC_DEBUG")
|
|
|
|
|
(stderr "type-helper: ~s\n" o))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
(,t (guard (type? t)) t)
|
|
|
|
|
(,p (guard (pointer? p)) p)
|
|
|
|
|
(,a (guard (c-array? a)) a)
|
2018-05-13 15:05:28 +00:00
|
|
|
|
(,b (guard (bit-field? b)) b)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
|
|
|
|
|
((char ,value) (get-type "char" info))
|
2018-05-19 09:41:53 +00:00
|
|
|
|
((enum-ref . _) (get-type "default" info))
|
|
|
|
|
((fixed ,value) (get-type "default" info))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
((float ,float) (get-type "float" info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((void) (get-type "void" info))
|
|
|
|
|
|
|
|
|
|
((ident ,name) (ident->type info name))
|
|
|
|
|
((tag ,name) (or (get-type o info)
|
|
|
|
|
o))
|
|
|
|
|
|
|
|
|
|
(,name (guard (string? name))
|
|
|
|
|
(let ((type (get-type name info)))
|
|
|
|
|
(ast->type type info)))
|
|
|
|
|
|
2018-05-14 18:14:42 +00:00
|
|
|
|
((type-name (decl-spec-list ,type) (abs-declr (pointer . ,pointer)))
|
|
|
|
|
(let ((rank (pointer->rank `(pointer ,@pointer)))
|
|
|
|
|
(type (ast->type type info)))
|
|
|
|
|
(rank+= type rank)))
|
|
|
|
|
|
|
|
|
|
((type-name ,type) (ast->type type info))
|
|
|
|
|
((type-spec ,type) (ast->type type info))
|
|
|
|
|
|
|
|
|
|
((sizeof-expr ,expr) (ast->type expr info))
|
|
|
|
|
((sizeof-type ,type) (ast->type type info))
|
|
|
|
|
|
|
|
|
|
((string ,string) (make-c-array (get-type "char" info) (1+ (string-length string))))
|
|
|
|
|
|
|
|
|
|
((decl-spec-list (type-spec ,type)) (ast->type type info))
|
|
|
|
|
|
2018-05-11 16:53:54 +00:00
|
|
|
|
((fctn-call (p-expr (ident ,name)) . _)
|
|
|
|
|
(or (and=> (assoc-ref (.functions info) name) function:type)
|
2018-05-19 09:41:53 +00:00
|
|
|
|
(get-type "default" info)))
|
2018-05-11 16:53:54 +00:00
|
|
|
|
|
|
|
|
|
((fctn-call (de-ref (p-expr (ident ,name))) . _)
|
|
|
|
|
(or (and=> (assoc-ref (.functions info) name) function:type)
|
2018-05-19 09:41:53 +00:00
|
|
|
|
(get-type "default" info)))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
|
|
|
|
|
((fixed-type ,type) (ast->type type info))
|
|
|
|
|
((float-type ,type) (ast->type type info))
|
|
|
|
|
((type-spec ,type) (ast->type type info))
|
|
|
|
|
((typename ,type) (ast->type type info))
|
|
|
|
|
|
|
|
|
|
((array-ref ,index ,array) (rank-- (ast->type array info)))
|
|
|
|
|
|
|
|
|
|
((de-ref ,expr) (rank-- (ast->type expr info)))
|
|
|
|
|
((ref-to ,expr) (rank++ (ast->type expr info)))
|
|
|
|
|
|
|
|
|
|
((p-expr ,expr) (ast->type expr info))
|
|
|
|
|
((pre-inc ,expr) (ast->type expr info))
|
|
|
|
|
((post-inc ,expr) (ast->type expr info))
|
|
|
|
|
|
|
|
|
|
((struct-ref (ident ,type))
|
|
|
|
|
(or (get-type type info)
|
|
|
|
|
(let ((struct (if (pair? type) type `(tag ,type))))
|
|
|
|
|
(ast->type struct info))))
|
|
|
|
|
((union-ref (ident ,type))
|
|
|
|
|
(or (get-type type info)
|
|
|
|
|
(let ((struct (if (pair? type) type `(tag ,type))))
|
|
|
|
|
(ast->type struct info))))
|
|
|
|
|
|
|
|
|
|
((struct-def (ident ,name) . _)
|
|
|
|
|
(ast->type `(tag ,name) info))
|
|
|
|
|
((union-def (ident ,name) . _)
|
|
|
|
|
(ast->type `(tag ,name) info))
|
|
|
|
|
((struct-def (field-list . ,fields))
|
|
|
|
|
(let ((fields (append-map (struct-field info) fields)))
|
|
|
|
|
(make-type 'struct (apply + (map field:size fields)) fields)))
|
|
|
|
|
((union-def (field-list . ,fields))
|
|
|
|
|
(let ((fields (append-map (struct-field info) fields)))
|
|
|
|
|
(make-type 'union (apply + (map field:size fields)) fields)))
|
|
|
|
|
((enum-def (enum-def-list . ,fields))
|
2018-05-19 09:41:53 +00:00
|
|
|
|
(get-type "default" info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
|
|
|
|
|
((d-sel (ident ,field) ,struct)
|
|
|
|
|
(let ((type0 (ast->type struct info)))
|
|
|
|
|
(ast->type (field-type info type0 field) info)))
|
|
|
|
|
|
|
|
|
|
((i-sel (ident ,field) ,struct)
|
|
|
|
|
(let ((type0 (ast->type (rank-- (ast->type struct info)) info)))
|
|
|
|
|
(ast->type (field-type info type0 field) info)))
|
|
|
|
|
|
|
|
|
|
;; arithmetic
|
|
|
|
|
((pre-inc ,a) (ast->type a info))
|
|
|
|
|
((pre-dec ,a) (ast->type a info))
|
|
|
|
|
((post-inc ,a) (ast->type a info))
|
|
|
|
|
((post-dec ,a) (ast->type a info))
|
|
|
|
|
((add ,a ,b) (ast->type a info))
|
|
|
|
|
((sub ,a ,b) (ast->type a info))
|
|
|
|
|
((bitwise-and ,a ,b) (ast->type a info))
|
|
|
|
|
((bitwise-not ,a) (ast->type a info))
|
|
|
|
|
((bitwise-or ,a ,b) (ast->type a info))
|
|
|
|
|
((bitwise-xor ,a ,b) (ast->type a info))
|
|
|
|
|
((lshift ,a ,b) (ast->type a info))
|
|
|
|
|
((rshift ,a ,b) (ast->type a info))
|
|
|
|
|
((div ,a ,b) (ast->type a info))
|
|
|
|
|
((mod ,a ,b) (ast->type a info))
|
|
|
|
|
((mul ,a ,b) (ast->type a info))
|
|
|
|
|
((not ,a) (ast->type a info))
|
|
|
|
|
((neg ,a) (ast->type a info))
|
|
|
|
|
((eq ,a ,b) (ast->type a info))
|
|
|
|
|
((ge ,a ,b) (ast->type a info))
|
|
|
|
|
((gt ,a ,b) (ast->type a info))
|
|
|
|
|
((ne ,a ,b) (ast->type a info))
|
|
|
|
|
((le ,a ,b) (ast->type a info))
|
|
|
|
|
((lt ,a ,b) (ast->type a info))
|
|
|
|
|
|
|
|
|
|
;; logical
|
|
|
|
|
((or ,a ,b) (ast->type a info))
|
|
|
|
|
((and ,a ,b) (ast->type a info))
|
|
|
|
|
|
|
|
|
|
((cast (type-name ,type) ,expr) (ast->type type info))
|
|
|
|
|
|
|
|
|
|
((cast (type-name ,type (abs-declr ,pointer)) ,expr)
|
|
|
|
|
(let ((rank (pointer->rank pointer)))
|
|
|
|
|
(rank+= (ast->type type info) rank)))
|
|
|
|
|
|
2018-05-11 13:13:55 +00:00
|
|
|
|
((decl-spec-list (type-spec ,type)) (ast->type type info))
|
2018-05-11 11:34:45 +00:00
|
|
|
|
|
2018-05-11 13:13:55 +00:00
|
|
|
|
;; ;; `typedef int size; void foo (unsigned size u)
|
2018-05-11 11:34:45 +00:00
|
|
|
|
((decl-spec-list (type-spec ,type) (type-spec ,type2))
|
|
|
|
|
(ast->type type info))
|
|
|
|
|
|
2018-05-11 13:13:55 +00:00
|
|
|
|
((assn-expr ,a ,op ,b) (ast->type a info))
|
|
|
|
|
|
|
|
|
|
((cond-expr _ ,a ,b) (ast->type a info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
|
|
|
|
|
(_ (get-type o info))))
|
|
|
|
|
|
|
|
|
|
(let ((type (type-helper o info)))
|
|
|
|
|
(cond ((or (type? type)
|
|
|
|
|
(pointer? type) type
|
|
|
|
|
(c-array? type)) type)
|
|
|
|
|
((and (equal? type o) (pair? type) (eq? (car type) 'tag)) o)
|
|
|
|
|
((equal? type o)
|
|
|
|
|
(error "ast->type: not supported: " o))
|
|
|
|
|
(else (ast->type type info)))))
|
|
|
|
|
|
|
|
|
|
(define (ast->basic-type o info)
|
|
|
|
|
(let ((type (->type (ast->type o info))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(cond ((type? type) type)
|
|
|
|
|
((equal? type o) o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(else (ast->type type info)))))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
|
|
|
|
(define (get-type o info)
|
|
|
|
|
(let ((t (assoc-ref (.types info) o)))
|
|
|
|
|
(pmatch t
|
|
|
|
|
((typedef ,next) (or (get-type next info) o))
|
|
|
|
|
(_ t))))
|
|
|
|
|
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (ast-type->size info o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((type (->type (ast->type o info))))
|
|
|
|
|
(cond ((type? type) (type:size type))
|
|
|
|
|
(else (stderr "ast-type->size barf: ~s => ~s\n" o type)
|
|
|
|
|
4))))
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
|
2018-05-11 13:52:30 +00:00
|
|
|
|
(define (field:name o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((struct (,name ,type ,size ,pointer) . ,rest) name)
|
|
|
|
|
((union (,name ,type ,size ,pointer) . ,rest) name)
|
|
|
|
|
((,name . ,type) name)
|
|
|
|
|
(_ (error "field:name not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (field:pointer o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((struct (,name ,type ,size ,pointer) . ,rest) pointer)
|
|
|
|
|
((union (,name ,type ,size ,pointer) . ,rest) pointer)
|
|
|
|
|
((,name . ,type) (->rank type))
|
|
|
|
|
(_ (error "field:pointer not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (field:size o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((struct . ,type) (apply + (map field:size (struct->fields type))))
|
|
|
|
|
((union . ,type) (apply max (map field:size (struct->fields type))))
|
|
|
|
|
((,name . ,type) (->size type))
|
|
|
|
|
(_ (error (format #f "field:size: ~s\n" o)))))
|
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (field-field info struct field)
|
2018-05-11 13:52:30 +00:00
|
|
|
|
(let ((fields (type:description struct)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(let loop ((fields fields))
|
|
|
|
|
(if (null? fields) (error (format #f "no such field: ~a in ~s" field struct))
|
|
|
|
|
(let ((f (car fields)))
|
|
|
|
|
(cond ((equal? (car f) field) f)
|
2018-05-11 13:52:30 +00:00
|
|
|
|
((and (memq (car f) '(struct union)) (type? (cdr f))
|
|
|
|
|
(find (lambda (x) (equal? (car x) field)) (struct->fields (cdr f)))))
|
2018-05-13 15:05:28 +00:00
|
|
|
|
((eq? (car f) 'bits) (assoc field (cdr f)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(else (loop (cdr fields)))))))))
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (field-offset info struct field)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(if (eq? (type:type struct) 'union) 0
|
|
|
|
|
(let ((fields (type:description struct)))
|
|
|
|
|
(let loop ((fields fields) (offset 0))
|
|
|
|
|
(if (null? fields) (error (format #f "no such field: ~a in ~s" field struct))
|
|
|
|
|
(let ((f (car fields)))
|
|
|
|
|
(cond ((equal? (car f) field) offset)
|
|
|
|
|
((and (eq? (car f) 'struct) (type? (cdr f)))
|
|
|
|
|
(let ((fields (type:description (cdr f))))
|
|
|
|
|
(find (lambda (x) (equal? (car x) field)) fields)
|
|
|
|
|
(apply + (cons offset
|
|
|
|
|
(map field:size
|
|
|
|
|
(member field (reverse fields)
|
|
|
|
|
(lambda (a b)
|
|
|
|
|
(equal? a (car b) field))))))))
|
2018-05-11 13:52:30 +00:00
|
|
|
|
((and (eq? (car f) 'union) (type? (cdr f))
|
|
|
|
|
(let ((fields (struct->fields (cdr f))))
|
|
|
|
|
(and (find (lambda (x) (equal? (car x) field)) fields)
|
|
|
|
|
offset))))
|
2018-05-13 15:05:28 +00:00
|
|
|
|
((and (eq? (car f) 'bits) (assoc-ref (cdr f) field)) offset)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(else (loop (cdr fields) (+ offset (field:size f)))))))))))
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (field-pointer info struct field)
|
|
|
|
|
(let ((field (field-field info struct field)))
|
|
|
|
|
(field:pointer field)))
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (field-size info struct field)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(if (eq? (type:type struct) 'union) 0
|
|
|
|
|
(let ((field (field-field info struct field)))
|
|
|
|
|
(field:size field))))
|
2017-01-17 18:03:08 +00:00
|
|
|
|
|
2018-05-11 13:52:30 +00:00
|
|
|
|
(define (field-size info struct field)
|
|
|
|
|
(let ((field (field-field info struct field)))
|
|
|
|
|
(field:size field)))
|
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (field-type info struct field)
|
|
|
|
|
(let ((field (field-field info struct field)))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(ast->type (cdr field) info)))
|
2017-04-17 00:15:11 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (struct->fields o)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(pmatch o
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (guard (and (type? o) (eq? (type:type o) 'struct)))
|
|
|
|
|
(append-map struct->fields (type:description o)))
|
|
|
|
|
(_ (guard (and (type? o) (eq? (type:type o) 'union)))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(append-map struct->fields (type:description o)))
|
2018-05-11 13:52:30 +00:00
|
|
|
|
((struct . ,type) (list (car (type:description type))))
|
2018-05-13 15:05:28 +00:00
|
|
|
|
((union . ,type) (list (car (type:description type))))
|
|
|
|
|
((bits . ,bits) bits)
|
2018-05-11 13:52:30 +00:00
|
|
|
|
(_ (list o))))
|
|
|
|
|
|
|
|
|
|
(define (struct->init-fields o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
(_ (guard (and (type? o) (eq? (type:type o) 'struct)))
|
|
|
|
|
(append-map struct->init-fields (type:description o)))
|
|
|
|
|
(_ (guard (and (type? o) (eq? (type:type o) 'union)))
|
|
|
|
|
(append-map struct->init-fields (type:description o)))
|
|
|
|
|
((struct . ,type) (struct->init-fields type))
|
|
|
|
|
((union . ,type) (list (car (type:description type))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (list o))))
|
2017-04-23 11:53:36 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (byte->hex.m1 o)
|
|
|
|
|
(string-drop o 2))
|
2017-02-27 06:50:33 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (asm->m1 o)
|
|
|
|
|
(let ((prefix ".byte "))
|
|
|
|
|
(if (not (string-prefix? prefix o)) (map (cut string-split <> #\space) (string-split o #\newline))
|
|
|
|
|
(let ((s (string-drop o (string-length prefix))))
|
|
|
|
|
(list (format #f "'~a'" (string-join (map byte->hex.m1 (cdr (string-split o #\space))) " ")))))))
|
2017-02-27 06:50:33 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (ident->variable info o)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(or (assoc-ref (.locals info) o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(assoc-ref (.statics info) o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(assoc-ref (filter (negate static-global?) (.globals info)) o)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(assoc-ref (.constants info) o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(assoc-ref (.functions info) o)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(begin
|
2018-05-11 11:34:45 +00:00
|
|
|
|
(error "ident->variable: undefined variable:" o))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (static-global? o)
|
|
|
|
|
((compose global:function cdr) o))
|
|
|
|
|
|
|
|
|
|
(define (string-global? o)
|
|
|
|
|
(and (pair? (car o))
|
|
|
|
|
(eq? (caar o) #:string)))
|
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (ident->type info o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let ((var (ident->variable info o)))
|
|
|
|
|
(cond ((global? var) (global:type var))
|
|
|
|
|
((local? var) (local:type var))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
((function? var) (function:type var))
|
2018-05-19 09:41:53 +00:00
|
|
|
|
((assoc-ref (.constants info) o) (assoc-ref (.types info) "default"))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((pair? var) (car var))
|
|
|
|
|
(else (stderr "ident->type ~s => ~s\n" o var)
|
|
|
|
|
#f))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (local:pointer o)
|
|
|
|
|
(->rank o))
|
|
|
|
|
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(define (ident->rank info o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(->rank (ident->variable info o)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (ident->size info o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((compose type:size (cut ident->type info <>)) o))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (pointer->rank o)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
((pointer) 1)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((pointer ,pointer) (1+ (pointer->rank pointer)))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(define (expr->rank info o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(->rank (ast->type o info)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (ast->size o info)
|
|
|
|
|
(->size (ast->type o info)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (append-text info text)
|
|
|
|
|
(clone info #:text (append (.text info) text)))
|
|
|
|
|
|
|
|
|
|
(define (push-global info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((rank (ident->rank info o)))
|
|
|
|
|
(cond ((< rank 0) (list (i386:push-label `(#:address ,o)))) ;; FIXME
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(else (list (i386:push-label-mem `(#:address ,o))))))))
|
|
|
|
|
|
|
|
|
|
(define (push-local locals)
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(wrap-as (i386:push-local (local:id o)))))
|
|
|
|
|
|
|
|
|
|
(define (push-global-address info)
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(list (i386:push-label o))))
|
|
|
|
|
|
|
|
|
|
(define (push-local-address locals)
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(wrap-as (i386:push-local-address (local:id o)))))
|
|
|
|
|
|
|
|
|
|
(define (push-local-de-ref info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((size (->size o)))
|
2017-12-03 15:33:35 +00:00
|
|
|
|
(case size
|
|
|
|
|
((1) (wrap-as (i386:push-byte-local-de-ref (local:id o))))
|
|
|
|
|
((2) (wrap-as (i386:push-word-local-de-ref (local:id o))))
|
|
|
|
|
((4) (wrap-as (i386:push-local-de-ref (local:id o))))
|
|
|
|
|
(else (error (format #f "TODO: push size >4: ~a\n" size)))))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
;; (if (= ptr 2) (ast-type->size info (local:type o)) ;; URG
|
|
|
|
|
;; 4)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (push-local-de-de-ref info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((size (->size (rank-- (rank-- o)))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(if (= size 1)
|
|
|
|
|
(wrap-as (i386:push-byte-local-de-de-ref (local:id o)))
|
|
|
|
|
(error "TODO int-de-de-ref")))))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (make-global-entry name type value)
|
|
|
|
|
(cons name (make-global name type value #f)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (string->global-entry string)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let ((value (append (string->list string) (list #\nul))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(make-global-entry `(#:string ,string) "char" value))) ;; FIXME char-array
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (make-local-entry name type id)
|
|
|
|
|
(cons name (make-local name type id)))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-04-07 10:56:17 +00:00
|
|
|
|
(define* (mescc:trace name #:optional (type ""))
|
|
|
|
|
(format (current-error-port) " :~a~a\n" name type))
|
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (push-ident info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-local (.locals info)))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-global info))
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-global info))
|
|
|
|
|
((assoc-ref (.constants info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (constant)
|
|
|
|
|
(wrap-as (append (i386:value->accu constant)
|
|
|
|
|
(i386:push-accu)))))
|
|
|
|
|
(else
|
|
|
|
|
((push-global-address #f) `(#:address ,o))))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (push-ident-address info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-local-address (.locals info)))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-global-address info))
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-global-address info))
|
|
|
|
|
(else
|
|
|
|
|
((push-global-address #f) `(#:address ,o))))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (push-ident-de-ref info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-local-de-ref info))
|
|
|
|
|
(else ((push-global info) o)))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (push-ident-de-de-ref info)
|
|
|
|
|
(lambda (o)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(push-local-de-de-ref info))
|
|
|
|
|
(else
|
|
|
|
|
(error "not supported: global push-ident-de-de-ref:" o)))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (expr->arg info)
|
|
|
|
|
(lambda (o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
((p-expr (string ,string))
|
|
|
|
|
(let* ((globals ((globals:add-string (.globals info)) string))
|
|
|
|
|
(info (clone info #:globals globals)))
|
|
|
|
|
(append-text info ((push-global-address info) `(#:string ,string)))))
|
|
|
|
|
(_ (let ((info (expr->accu o info)))
|
|
|
|
|
(append-text info (wrap-as (i386:push-accu))))))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (globals:add-string globals)
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(let ((string `(#:string ,o)))
|
|
|
|
|
(if (assoc-ref globals string) globals
|
|
|
|
|
(append globals (list (string->global-entry o)))))))
|
|
|
|
|
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
(define (ident->accu info)
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
(lambda (o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o) => local->accu)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((assoc-ref (.statics info) o) => global->accu)
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o) => global->accu)
|
|
|
|
|
((assoc-ref (.constants info) o) => number->accu)
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(else (list (i386:label->accu `(#:address ,o)))))))
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (local->accu o)
|
|
|
|
|
(let* ((type (local:type o)))
|
|
|
|
|
(cond ((or (c-array? type)
|
|
|
|
|
(structured-type? type)) (wrap-as (i386:local-ptr->accu (local:id o))))
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(else (append (wrap-as (i386:local->accu (local:id o)))
|
|
|
|
|
(convert-accu type))))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
|
|
|
|
|
(define (global->accu o)
|
|
|
|
|
(let ((type (global:type o)))
|
|
|
|
|
(cond ((or (c-array? type)
|
|
|
|
|
(structured-type? type)) (wrap-as (i386:label->accu `(#:address ,o))))
|
|
|
|
|
(else (wrap-as (i386:label-mem->accu `(#:address ,o)))))))
|
|
|
|
|
|
|
|
|
|
(define (number->accu o)
|
|
|
|
|
(wrap-as (i386:value->accu o)))
|
|
|
|
|
|
2017-04-17 00:15:11 +00:00
|
|
|
|
(define (ident-address->accu info)
|
|
|
|
|
(lambda (o)
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (local) (wrap-as (i386:local-ptr->accu (local:id local)))))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:label->accu `(#:address ,global)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
2018-05-04 18:45:27 +00:00
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:label->accu `(#:address ,global)))))
|
|
|
|
|
(else (list (i386:label->accu `(#:address ,o)))))))
|
2017-04-17 00:15:11 +00:00
|
|
|
|
|
|
|
|
|
(define (ident-address->base info)
|
|
|
|
|
(lambda (o)
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(cond
|
|
|
|
|
((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (local) (wrap-as (i386:local-ptr->base (local:id local)))))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:label->base `(#:address ,global)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
2018-05-04 18:45:27 +00:00
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:label->base `(#:address ,global)))))
|
|
|
|
|
(else (list (i386:label->base `(#:address ,o)))))))
|
2017-04-17 00:15:11 +00:00
|
|
|
|
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
(define (value->accu v)
|
2017-04-07 07:36:30 +00:00
|
|
|
|
(wrap-as (i386:value->accu v)))
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (accu->local+n-text local n)
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(let ((id (local:id local))) (wrap-as (i386:accu->local+n id n))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
(define (accu->ident info)
|
2017-01-03 11:52:59 +00:00
|
|
|
|
(lambda (o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (local) (let ((size (->size local)))
|
|
|
|
|
(if (<= size 4) (wrap-as (i386:accu->local (local:id local)))
|
|
|
|
|
(wrap-as (i386:accu*n->local (local:id local) size))))))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (let ((size (->size global)))
|
|
|
|
|
(if (<= size 4) (wrap-as (i386:accu->label global))
|
|
|
|
|
(wrap-as (i386:accu*n->label global size))))))
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (let ((size (->size global)))
|
|
|
|
|
(if (<= size 4) (wrap-as (i386:accu->label global))
|
|
|
|
|
(wrap-as (i386:accu*n->label global size)))))))))
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
(define (value->ident info)
|
|
|
|
|
(lambda (o value)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (local) (wrap-as (i386:value->local (local:id local) value))))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:value->label `(#:address ,global) value))))
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:value->label `(#:address ,global) value)))))))
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
(define (ident-add info)
|
|
|
|
|
(lambda (o n)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (local) (wrap-as (i386:local-add (local:id local) n))))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:label-mem-add `(#:address ,o) n))))
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (i386:label-mem-add `(#:address ,global) n)))))))
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
|
2017-04-17 00:15:11 +00:00
|
|
|
|
(define (ident-address-add info)
|
|
|
|
|
(lambda (o n)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(cond ((assoc-ref (.locals info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (local) (wrap-as (append (i386:push-accu)
|
|
|
|
|
(i386:local->accu (local:id local))
|
|
|
|
|
(i386:accu-mem-add n)
|
|
|
|
|
(i386:pop-accu)))))
|
|
|
|
|
((assoc-ref (.statics info) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (wrap-as (append (i386:push-accu)
|
|
|
|
|
(i386:label->accu `(#:address ,global))
|
|
|
|
|
(i386:accu-mem-add n)
|
|
|
|
|
(i386:pop-accu))))))
|
|
|
|
|
((assoc-ref (filter (negate static-global?) (.globals info)) o)
|
|
|
|
|
=>
|
|
|
|
|
(lambda (global) (list (wrap-as (append (i386:push-accu)
|
|
|
|
|
(i386:label->accu `(#:address ,global))
|
|
|
|
|
(i386:accu-mem-add n)
|
|
|
|
|
(i386:pop-accu)))))))))
|
2017-04-17 00:15:11 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (make-comment o)
|
|
|
|
|
(wrap-as `((#:comment ,o))))
|
2017-07-16 22:29:18 +00:00
|
|
|
|
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(define (ast->comment o)
|
2018-04-07 11:13:26 +00:00
|
|
|
|
(if mes? '()
|
2018-05-11 11:34:45 +00:00
|
|
|
|
(let ((source (with-output-to-string (lambda () (pretty-print-c99 o)))))
|
|
|
|
|
(make-comment (string-join (string-split source #\newline) " ")))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
|
|
|
|
(define (accu*n info n)
|
|
|
|
|
(append-text info (wrap-as (case n
|
|
|
|
|
((1) (i386:accu->base))
|
|
|
|
|
((2) (i386:accu+accu))
|
|
|
|
|
((3) (append (i386:accu->base)
|
|
|
|
|
(i386:accu+accu)
|
|
|
|
|
(i386:accu+base)))
|
|
|
|
|
((4) (i386:accu-shl 2))
|
|
|
|
|
((8) (append (i386:accu+accu)
|
|
|
|
|
(i386:accu-shl 2)))
|
|
|
|
|
((12) (append (i386:accu->base)
|
|
|
|
|
(i386:accu+accu)
|
|
|
|
|
(i386:accu+base)
|
|
|
|
|
(i386:accu-shl 2)))
|
|
|
|
|
((16) (i386:accu-shl 4))
|
|
|
|
|
(else (append (i386:value->base n)
|
|
|
|
|
(i386:accu*base)))))))
|
|
|
|
|
|
|
|
|
|
(define (accu->base-mem*n- info n)
|
|
|
|
|
(wrap-as
|
|
|
|
|
(case n
|
|
|
|
|
((1) (i386:byte-accu->base-mem))
|
|
|
|
|
((2) (i386:word-accu->base-mem))
|
|
|
|
|
((4) (i386:accu->base-mem))
|
|
|
|
|
(else (append (let loop ((i 0))
|
|
|
|
|
(if (>= i n) '()
|
|
|
|
|
(append (if (= i 0) '()
|
|
|
|
|
(append (i386:accu+value 4)
|
|
|
|
|
(i386:base+value 4)))
|
|
|
|
|
(case (- n i)
|
|
|
|
|
((1) (append (i386:accu+value -3)
|
|
|
|
|
(i386:base+value -3)
|
|
|
|
|
(i386:accu-mem->base-mem)))
|
|
|
|
|
((2) (append (i386:accu+value -2)
|
|
|
|
|
(i386:base+value -2)
|
|
|
|
|
(i386:accu-mem->base-mem)))
|
|
|
|
|
((3) (append (i386:accu+value -1)
|
|
|
|
|
(i386:base+value -1)
|
|
|
|
|
(i386:accu-mem->base-mem)))
|
|
|
|
|
(else (i386:accu-mem->base-mem)))
|
|
|
|
|
(loop (+ i 4))))))))))
|
|
|
|
|
|
|
|
|
|
(define (accu->base-mem*n info n)
|
|
|
|
|
(append-text info (accu->base-mem*n- info n)))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (expr->accu* o info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
|
|
|
|
|
((p-expr (ident ,name))
|
|
|
|
|
(append-text info ((ident-address->accu info) name)))
|
|
|
|
|
|
|
|
|
|
((de-ref ,expr)
|
|
|
|
|
(expr->accu expr info))
|
|
|
|
|
|
|
|
|
|
((d-sel (ident ,field) ,struct)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let* ((type (ast->basic-type struct info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(offset (field-offset info type field))
|
|
|
|
|
(info (expr->accu* struct info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+value offset)))))
|
|
|
|
|
|
|
|
|
|
((i-sel (ident ,field) (fctn-call (p-expr (ident ,function)) . ,rest))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let* ((type (ast->basic-type `(fctn-call (p-expr (ident ,function)) ,@rest) info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(offset (field-offset info type field))
|
|
|
|
|
(info (expr->accu `(fctn-call (p-expr (ident ,function)) ,@rest) info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+value offset)))))
|
|
|
|
|
|
|
|
|
|
((i-sel (ident ,field) ,struct)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let* ((type (ast->basic-type struct info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(offset (field-offset info type field))
|
|
|
|
|
(info (expr->accu* struct info)))
|
|
|
|
|
(append-text info (append (wrap-as (i386:mem->accu))
|
|
|
|
|
(wrap-as (i386:accu+value offset))))))
|
|
|
|
|
|
|
|
|
|
((array-ref ,index ,array)
|
|
|
|
|
(let* ((info (expr->accu index info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(size (ast->size o info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(info (accu*n info size))
|
|
|
|
|
(info (expr->base array info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+base)))))
|
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
((cast ,type ,expr)
|
2018-05-11 22:20:51 +00:00
|
|
|
|
(expr->accu `(ref-to ,expr) info))
|
|
|
|
|
|
|
|
|
|
((add ,a ,b)
|
|
|
|
|
(let* ((rank (expr->rank info a))
|
|
|
|
|
(rank-b (expr->rank info b))
|
|
|
|
|
(type (ast->basic-type a info))
|
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info a))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1))))
|
|
|
|
|
(if (or (= size 1)) ((binop->accu* info) a b (i386:accu+base))
|
|
|
|
|
(let* ((info (expr->accu b info))
|
|
|
|
|
(info (append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu*base)
|
|
|
|
|
(i386:accu->base)))))
|
|
|
|
|
(info (expr->accu* a info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+base)))))))
|
|
|
|
|
|
2018-05-13 15:05:28 +00:00
|
|
|
|
((sub ,a ,b)
|
|
|
|
|
(let* ((rank (expr->rank info a))
|
|
|
|
|
(rank-b (expr->rank info b))
|
|
|
|
|
(type (ast->basic-type a info))
|
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (->size type))
|
|
|
|
|
(size (cond ((= rank 1) size)
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1))))
|
|
|
|
|
(if (or (= size 1) (or (= rank-b 2) (= rank-b 1)))
|
|
|
|
|
(let ((info ((binop->accu* info) a b (i386:accu-base))))
|
|
|
|
|
(if (and (not (= rank-b 2)) (not (= rank-b 1))) info
|
|
|
|
|
(append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu/base))))))
|
|
|
|
|
(let* ((info (expr->accu* b info))
|
|
|
|
|
(info (append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu*base)
|
|
|
|
|
(i386:accu->base)))))
|
|
|
|
|
(info (expr->accu* a info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu-base)))))))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
|
2018-05-13 15:05:28 +00:00
|
|
|
|
((pre-dec ,expr)
|
|
|
|
|
(let* ((rank (expr->rank info expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info ((expr-add info) expr (- size)))
|
|
|
|
|
(info (append (expr->accu* expr info))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((pre-inc ,expr)
|
|
|
|
|
(let* ((rank (expr->rank info expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info ((expr-add info) expr size))
|
|
|
|
|
(info (append (expr->accu* expr info))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((post-dec ,expr)
|
|
|
|
|
(let* ((info (expr->accu* expr info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(post (clone info #:text '()))
|
|
|
|
|
(post (append-text post (ast->comment o)))
|
|
|
|
|
(post (append-text post (wrap-as (i386:pop-base))))
|
|
|
|
|
(post (append-text post (wrap-as (i386:push-accu))))
|
|
|
|
|
(post (append-text post (wrap-as (i386:base->accu))))
|
|
|
|
|
(rank (expr->rank post expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size post expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(post ((expr-add post) expr (- size)))
|
|
|
|
|
(post (append-text post (wrap-as (i386:pop-accu)))))
|
|
|
|
|
(clone info #:post (.text post))))
|
|
|
|
|
|
|
|
|
|
((post-inc ,expr)
|
|
|
|
|
(let* ((info (expr->accu* expr info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(post (clone info #:text '()))
|
|
|
|
|
(post (append-text post (ast->comment o)))
|
|
|
|
|
(post (append-text post (wrap-as (i386:pop-base))))
|
|
|
|
|
(post (append-text post (wrap-as (i386:push-accu))))
|
|
|
|
|
(post (append-text post (wrap-as (i386:base->accu))))
|
|
|
|
|
(rank (expr->rank post expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size post expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(post ((expr-add post) expr size))
|
|
|
|
|
(post (append-text post (wrap-as (i386:pop-accu)))))
|
|
|
|
|
(clone info #:post (.text post))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(_ (error "expr->accu*: not supported: " o))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(define (expr-add info)
|
|
|
|
|
(lambda (o n)
|
|
|
|
|
(let* ((info (expr->accu* o info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-mem-add n)))))
|
|
|
|
|
info)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(define (expr->accu o info)
|
|
|
|
|
(let ((locals (.locals info))
|
|
|
|
|
(text (.text info))
|
|
|
|
|
(globals (.globals info)))
|
|
|
|
|
(define (helper)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((expr) info)
|
|
|
|
|
|
|
|
|
|
((comma-expr) info)
|
|
|
|
|
|
|
|
|
|
((comma-expr ,a . ,rest)
|
|
|
|
|
(let ((info (expr->accu a info)))
|
|
|
|
|
(expr->accu `(comma-expr ,@rest) info)))
|
|
|
|
|
|
|
|
|
|
((p-expr (string ,string))
|
|
|
|
|
(let* ((globals ((globals:add-string globals) string))
|
|
|
|
|
(info (clone info #:globals globals)))
|
|
|
|
|
(append-text info (list (i386:label->accu `(#:string ,string))))))
|
|
|
|
|
|
2018-05-14 20:37:53 +00:00
|
|
|
|
((p-expr (string . ,strings))
|
|
|
|
|
(let* ((string (apply string-append strings))
|
|
|
|
|
(globals ((globals:add-string globals) string))
|
|
|
|
|
(info (clone info #:globals globals)))
|
|
|
|
|
(append-text info (list (i386:label->accu `(#:string ,string))))))
|
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
((p-expr (fixed ,value))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(let ((value (cstring->int value)))
|
|
|
|
|
(append-text info (wrap-as (i386:value->accu value)))))
|
|
|
|
|
|
|
|
|
|
((p-expr (float ,value))
|
|
|
|
|
(let ((value (cstring->float value)))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(append-text info (wrap-as (i386:value->accu value)))))
|
|
|
|
|
|
|
|
|
|
((neg (p-expr (fixed ,value)))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(let ((value (- (cstring->int value))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(append-text info (wrap-as (i386:value->accu value)))))
|
|
|
|
|
|
|
|
|
|
((p-expr (char ,char))
|
|
|
|
|
(let ((char (char->integer (car (string->list char)))))
|
|
|
|
|
(append-text info (wrap-as (i386:value->accu char)))))
|
|
|
|
|
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(,char (guard (char? char)) (append-text info (wrap-as (i386:value->accu char))))
|
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
((p-expr (ident ,name))
|
|
|
|
|
(append-text info ((ident->accu info) name)))
|
|
|
|
|
|
|
|
|
|
((initzer ,initzer)
|
|
|
|
|
(expr->accu initzer info))
|
|
|
|
|
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(((initzer ,initzer))
|
|
|
|
|
(expr->accu initzer info))
|
|
|
|
|
|
2018-05-13 11:50:32 +00:00
|
|
|
|
;; offsetoff
|
|
|
|
|
((ref-to (i-sel (ident ,field) (cast (type-name (decl-spec-list ,struct) (abs-declr (pointer))) (p-expr (fixed ,base)))))
|
|
|
|
|
(let* ((type (ast->basic-type struct info))
|
|
|
|
|
(offset (field-offset info type field))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(base (cstring->int base)))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(append-text info (wrap-as (i386:value->accu (+ base offset))))))
|
|
|
|
|
|
|
|
|
|
;; &foo
|
|
|
|
|
((ref-to (p-expr (ident ,name)))
|
|
|
|
|
(append-text info ((ident-address->accu info) name)))
|
|
|
|
|
|
|
|
|
|
;; &*foo
|
|
|
|
|
((ref-to (de-ref ,expr))
|
|
|
|
|
(expr->accu expr info))
|
|
|
|
|
|
|
|
|
|
((ref-to ,expr)
|
|
|
|
|
(expr->accu* expr info))
|
|
|
|
|
|
|
|
|
|
((sizeof-expr ,expr)
|
|
|
|
|
(append-text info (wrap-as (i386:value->accu (ast->size expr info)))))
|
|
|
|
|
|
|
|
|
|
((sizeof-type ,type)
|
|
|
|
|
(append-text info (wrap-as (i386:value->accu (ast->size type info)))))
|
|
|
|
|
|
|
|
|
|
((array-ref ,index ,array)
|
|
|
|
|
(let* ((info (expr->accu* o info))
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(type (ast->type o info)))
|
|
|
|
|
(append-text info (mem->accu type))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
((d-sel ,field ,struct)
|
|
|
|
|
(let* ((info (expr->accu* o info))
|
|
|
|
|
(info (append-text info (ast->comment o)))
|
|
|
|
|
(type (ast->type o info))
|
|
|
|
|
(size (->size type))
|
|
|
|
|
(array? (c-array? type)))
|
|
|
|
|
(if array? info
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(append-text info (mem->accu type)))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
((i-sel ,field ,struct)
|
|
|
|
|
(let* ((info (expr->accu* o info))
|
|
|
|
|
(info (append-text info (ast->comment o)))
|
|
|
|
|
(type (ast->type o info))
|
|
|
|
|
(size (->size type))
|
|
|
|
|
(array? (c-array? type)))
|
|
|
|
|
(if array? info
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(append-text info (mem->accu type)))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
((de-ref ,expr)
|
|
|
|
|
(let* ((info (expr->accu expr info))
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(type (ast->type o info)))
|
|
|
|
|
(append-text info (mem->accu type))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
((fctn-call (p-expr (ident ,name)) (expr-list . ,expr-list))
|
|
|
|
|
(if (equal? name "asm") (let ((arg0 (cadr (cadar expr-list)))) ;; FIXME
|
|
|
|
|
(append-text info (wrap-as (asm->m1 arg0))))
|
|
|
|
|
(let* ((text-length (length text))
|
|
|
|
|
(args-info (let loop ((expressions (reverse expr-list)) (info info))
|
|
|
|
|
(if (null? expressions) info
|
|
|
|
|
(loop (cdr expressions) ((expr->arg info) (car expressions))))))
|
|
|
|
|
(n (length expr-list)))
|
|
|
|
|
(if (not (assoc-ref locals name))
|
|
|
|
|
(begin
|
|
|
|
|
(if (and (not (assoc name (.functions info)))
|
|
|
|
|
(not (assoc name globals))
|
|
|
|
|
(not (equal? name (.function info))))
|
|
|
|
|
(stderr "warning: undeclared function: ~a\n" name))
|
|
|
|
|
(append-text args-info (list (i386:call-label name n))))
|
|
|
|
|
(let* ((empty (clone info #:text '()))
|
|
|
|
|
(accu (expr->accu `(p-expr (ident ,name)) empty)))
|
|
|
|
|
(append-text args-info (append (.text accu)
|
|
|
|
|
(list (i386:call-accu n)))))))))
|
|
|
|
|
|
|
|
|
|
((fctn-call ,function (expr-list . ,expr-list))
|
|
|
|
|
(let* ((text-length (length text))
|
|
|
|
|
(args-info (let loop ((expressions (reverse expr-list)) (info info))
|
|
|
|
|
(if (null? expressions) info
|
|
|
|
|
(loop (cdr expressions) ((expr->arg info) (car expressions))))))
|
|
|
|
|
(n (length expr-list))
|
|
|
|
|
(empty (clone info #:text '()))
|
|
|
|
|
(accu (expr->accu function empty)))
|
|
|
|
|
(append-text args-info (append (.text accu)
|
|
|
|
|
(list (i386:call-accu n))))))
|
|
|
|
|
|
|
|
|
|
((cond-expr . ,cond-expr)
|
|
|
|
|
(ast->info `(expr-stmt ,o) info))
|
|
|
|
|
|
|
|
|
|
((post-inc ,expr)
|
|
|
|
|
(let* ((info (append (expr->accu expr info)))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(rank (expr->rank info expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info ((expr-add info) expr size))
|
|
|
|
|
(info (append-text info (wrap-as (i386:pop-accu)))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((post-dec ,expr)
|
|
|
|
|
(let* ((info (append (expr->accu expr info)))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(rank (expr->rank info expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info ((expr-add info) expr (- size)))
|
|
|
|
|
(info (append-text info (wrap-as (i386:pop-accu)))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((pre-inc ,expr)
|
|
|
|
|
(let* ((rank (expr->rank info expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info ((expr-add info) expr size))
|
|
|
|
|
(info (append (expr->accu expr info))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((pre-dec ,expr)
|
|
|
|
|
(let* ((rank (expr->rank info expr))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info expr))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info ((expr-add info) expr (- size)))
|
|
|
|
|
(info (append (expr->accu expr info))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
((add ,a (p-expr (fixed ,value)))
|
|
|
|
|
(let* ((rank (expr->rank info a))
|
|
|
|
|
(type (ast->basic-type a info))
|
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info a))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info (expr->accu a info))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(value (cstring->int value))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(value (* size value)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+value value)))))
|
|
|
|
|
|
|
|
|
|
((add ,a ,b)
|
|
|
|
|
(let* ((rank (expr->rank info a))
|
|
|
|
|
(rank-b (expr->rank info b))
|
|
|
|
|
(type (ast->basic-type a info))
|
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info a))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1))))
|
|
|
|
|
(if (or (= size 1)) ((binop->accu info) a b (i386:accu+base))
|
|
|
|
|
(let* ((info (expr->accu b info))
|
|
|
|
|
(info (append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu*base)
|
|
|
|
|
(i386:accu->base)))))
|
|
|
|
|
(info (expr->accu a info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+base)))))))
|
|
|
|
|
|
|
|
|
|
((sub ,a (p-expr (fixed ,value)))
|
|
|
|
|
(let* ((rank (expr->rank info a))
|
|
|
|
|
(type (ast->basic-type a info))
|
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (->size type))
|
|
|
|
|
(size (cond ((= rank 1) size)
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info (expr->accu a info))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(value (cstring->int value))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(value (* size value)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu+value (- value))))))
|
|
|
|
|
|
|
|
|
|
((sub ,a ,b)
|
|
|
|
|
(let* ((rank (expr->rank info a))
|
|
|
|
|
(rank-b (expr->rank info b))
|
|
|
|
|
(type (ast->basic-type a info))
|
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (->size type))
|
|
|
|
|
(size (cond ((= rank 1) size)
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1))))
|
|
|
|
|
(if (or (= size 1) (or (= rank-b 2) (= rank-b 1)))
|
|
|
|
|
(let ((info ((binop->accu info) a b (i386:accu-base))))
|
|
|
|
|
(if (and (not (= rank-b 2)) (not (= rank-b 1))) info
|
|
|
|
|
(append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu/base))))))
|
|
|
|
|
(let* ((info (expr->accu b info))
|
|
|
|
|
(info (append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu*base)
|
|
|
|
|
(i386:accu->base)))))
|
|
|
|
|
(info (expr->accu a info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu-base)))))))
|
|
|
|
|
|
|
|
|
|
((bitwise-and ,a ,b) ((binop->accu info) a b (i386:accu-and-base)))
|
|
|
|
|
((bitwise-not ,expr)
|
|
|
|
|
(let ((info (ast->info expr info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu-not)))))
|
|
|
|
|
((bitwise-or ,a ,b) ((binop->accu info) a b (i386:accu-or-base)))
|
|
|
|
|
((bitwise-xor ,a ,b) ((binop->accu info) a b (i386:accu-xor-base)))
|
|
|
|
|
((lshift ,a ,b) ((binop->accu info) a b (i386:accu<<base)))
|
|
|
|
|
((rshift ,a ,b) ((binop->accu info) a b (i386:accu>>base)))
|
|
|
|
|
((div ,a ,b) ((binop->accu info) a b (i386:accu/base)))
|
|
|
|
|
((mod ,a ,b) ((binop->accu info) a b (i386:accu%base)))
|
|
|
|
|
((mul ,a ,b) ((binop->accu info) a b (i386:accu*base)))
|
|
|
|
|
|
|
|
|
|
((not ,expr)
|
|
|
|
|
(let* ((test-info (ast->info expr info)))
|
|
|
|
|
(clone info #:text
|
|
|
|
|
(append (.text test-info)
|
|
|
|
|
(wrap-as (i386:accu-negate)))
|
|
|
|
|
#:globals (.globals test-info))))
|
|
|
|
|
|
|
|
|
|
((neg ,expr)
|
|
|
|
|
(let ((info (expr->base expr info)))
|
|
|
|
|
(append-text info (append (wrap-as (i386:value->accu 0))
|
|
|
|
|
(wrap-as (i386:sub-base))))))
|
|
|
|
|
|
|
|
|
|
((eq ,a ,b) ((binop->accu info) a b (append (i386:sub-base) (i386:z->accu))))
|
2018-05-19 09:41:53 +00:00
|
|
|
|
|
|
|
|
|
((ge ,a ,b)
|
|
|
|
|
(let* ((type-a (ast->type a info))
|
|
|
|
|
(type-b (ast->type b info))
|
|
|
|
|
(test->accu (if (or (unsigned? type-a) (unsigned? type-b)) i386:ae?->accu i386:ge?->accu)))
|
|
|
|
|
((binop->accu info) a b (append (i386:sub-base) (test->accu) (i386:accu-test)))))
|
|
|
|
|
|
|
|
|
|
((gt ,a ,b)
|
|
|
|
|
(let* ((type-a (ast->type a info))
|
|
|
|
|
(type-b (ast->type b info))
|
|
|
|
|
(test->accu (if (or (unsigned? type-a) (unsigned? type-b)) i386:a?->accu i386:g?->accu)))
|
|
|
|
|
((binop->accu info) a b (append (i386:sub-base) (test->accu) (i386:accu-test)))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
;; FIXME: set accu *and* flags
|
|
|
|
|
((ne ,a ,b) ((binop->accu info) a b (append (i386:push-accu)
|
|
|
|
|
(i386:sub-base)
|
|
|
|
|
(i386:nz->accu)
|
|
|
|
|
(i386:accu<->stack)
|
|
|
|
|
(i386:sub-base)
|
|
|
|
|
(i386:xor-zf)
|
|
|
|
|
(i386:pop-accu))))
|
|
|
|
|
|
|
|
|
|
((ne ,a ,b) ((binop->accu info) a b (append (i386:sub-base) (i386:xor-zf))))
|
2018-05-19 09:41:53 +00:00
|
|
|
|
|
|
|
|
|
((le ,a ,b)
|
|
|
|
|
(let* ((type-a (ast->type a info))
|
|
|
|
|
(type-b (ast->type b info))
|
|
|
|
|
(test->accu (if (or (unsigned? type-a) (unsigned? type-b)) i386:be?->accu i386:le?->accu)))
|
|
|
|
|
((binop->accu info) a b (append (i386:sub-base) (test->accu) (i386:accu-test)))))
|
|
|
|
|
|
|
|
|
|
((lt ,a ,b)
|
|
|
|
|
(let* ((type-a (ast->type a info))
|
|
|
|
|
(type-b (ast->type b info))
|
|
|
|
|
(test->accu (if (or (unsigned? type-a) (unsigned? type-b)) i386:b?->accu i386:l?->accu)))
|
|
|
|
|
((binop->accu info) a b (append (i386:sub-base) (test->accu) (i386:accu-test)))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
((or ,a ,b)
|
|
|
|
|
(let* ((info (expr->accu a info))
|
|
|
|
|
(here (number->string (length (.text info))))
|
|
|
|
|
(skip-b-label (string-append "_" (.function info) "_" here "_or_skip_b"))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-test))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump-nz skip-b-label))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-test))))
|
|
|
|
|
(info (expr->accu b info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-test))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,skip-b-label))))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((and ,a ,b)
|
|
|
|
|
(let* ((info (expr->accu a info))
|
|
|
|
|
(here (number->string (length (.text info))))
|
|
|
|
|
(skip-b-label (string-append "_" (.function info) "_" here "_and_skip_b"))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-test))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump-z skip-b-label))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-test))))
|
|
|
|
|
(info (expr->accu b info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-test))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,skip-b-label))))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((cast ,type ,expr)
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(let ((info (expr->accu expr info))
|
|
|
|
|
(type (ast->type o info)))
|
|
|
|
|
(append-text info (convert-accu type))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
|
|
|
|
|
((assn-expr (de-ref (post-inc (p-expr (ident ,name)))) (op ,op) ,b)
|
|
|
|
|
(let* ((info (expr->accu `(assn-expr (de-ref (p-expr (ident ,name))) (op ,op) ,b) info))
|
|
|
|
|
(type (ident->type info name))
|
|
|
|
|
(rank (ident->rank info name))
|
|
|
|
|
(size (if (> rank 1) 4 1)))
|
|
|
|
|
(append-text info ((ident-add info) name size))))
|
|
|
|
|
|
|
|
|
|
((assn-expr (de-ref (post-dec (p-expr (ident ,name)))) (op ,op) ,b)
|
|
|
|
|
(let* ((info (expr->accu `(assn-expr (de-ref (p-expr (ident ,name))) (op ,op) ,b) info))
|
|
|
|
|
(type (ident->type info name))
|
|
|
|
|
(rank (ident->rank info name))
|
|
|
|
|
(size (if (> rank 1) 4 1)))
|
|
|
|
|
(append-text info ((ident-add info) name (- size)))))
|
|
|
|
|
|
|
|
|
|
((assn-expr ,a (op ,op) ,b)
|
|
|
|
|
(let* ((info (append-text info (ast->comment o)))
|
|
|
|
|
(type (ast->type a info))
|
|
|
|
|
(rank (->rank type))
|
|
|
|
|
(type-b (ast->type b info))
|
|
|
|
|
(rank-b (->rank type-b))
|
|
|
|
|
(size (->size type))
|
|
|
|
|
(size-b (->size type-b))
|
|
|
|
|
(info (expr->accu b info))
|
|
|
|
|
(info (if (equal? op "=") info
|
|
|
|
|
(let* ((struct? (structured-type? type))
|
|
|
|
|
(size (cond ((= rank 1) (ast-type->size info a))
|
|
|
|
|
((> rank 1) 4)
|
|
|
|
|
((and struct? (= rank 2)) 4)
|
|
|
|
|
(else 1)))
|
|
|
|
|
(info (if (or (= size 1) (= rank-b 1)) info
|
|
|
|
|
(let ((info (append-text info (wrap-as (i386:value->base size)))))
|
|
|
|
|
(append-text info (wrap-as (i386:accu*base))))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(info (expr->accu a info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:pop-base))))
|
|
|
|
|
(info (append-text info (cond ((equal? op "+=") (wrap-as (i386:accu+base)))
|
|
|
|
|
((equal? op "-=") (wrap-as (i386:accu-base)))
|
|
|
|
|
((equal? op "*=") (wrap-as (i386:accu*base)))
|
|
|
|
|
((equal? op "/=") (wrap-as (i386:accu/base)))
|
|
|
|
|
((equal? op "%=") (wrap-as (i386:accu%base)))
|
|
|
|
|
((equal? op "&=") (wrap-as (i386:accu-and-base)))
|
|
|
|
|
((equal? op "|=") (wrap-as (i386:accu-or-base)))
|
|
|
|
|
((equal? op "^=") (wrap-as (i386:accu-xor-base)))
|
|
|
|
|
((equal? op ">>=") (wrap-as (i386:accu>>base)))
|
|
|
|
|
((equal? op "<<=") (wrap-as (i386:accu<<base)))
|
|
|
|
|
(else (error (format #f "mescc: op ~a not supported: ~a\n" op o)))))))
|
|
|
|
|
(cond ((not (and (= rank 1) (= rank-b 1))) info)
|
|
|
|
|
((equal? op "-=") (append-text info (wrap-as (append (i386:value->base size)
|
|
|
|
|
(i386:accu/base)))))
|
|
|
|
|
(else (error (format #f "invalid operands to binary ~s (have ~s* and ~s*)" op type (ast->basic-type b info)))))))))
|
|
|
|
|
(when (and (equal? op "=")
|
|
|
|
|
(not (= size size-b))
|
|
|
|
|
(not (and (or (= size 1) (= size 2))
|
|
|
|
|
(= size-b 4)))
|
|
|
|
|
(not (and (= size 2)
|
|
|
|
|
(= size-b 4)))
|
|
|
|
|
(not (and (= size 4)
|
|
|
|
|
(or (= size-b 1) (= size-b 2)))))
|
|
|
|
|
(stderr "ERROR assign: ~a" (with-output-to-string (lambda () (pretty-print-c99 o))))
|
|
|
|
|
(stderr " size[~a]:~a != size[~a]:~a\n" rank size rank-b size-b))
|
|
|
|
|
(pmatch a
|
|
|
|
|
((p-expr (ident ,name))
|
|
|
|
|
(if (or (<= size 4) ;; FIXME: long long = int
|
|
|
|
|
(<= size-b 4)) (append-text info ((accu->ident info) name))
|
|
|
|
|
(let ((info (expr->base* a info)))
|
|
|
|
|
(accu->base-mem*n info size))))
|
2018-05-13 15:05:28 +00:00
|
|
|
|
(_ (let* ((info (expr->base* a info))
|
|
|
|
|
(info (if (not (bit-field? type)) info
|
|
|
|
|
(let* ((bit (bit-field:bit type))
|
|
|
|
|
(bits (bit-field:bits type))
|
|
|
|
|
(set-mask (- (ash bits 1) 1))
|
|
|
|
|
(shifted-set-mask (ash set-mask bit))
|
|
|
|
|
(clear-mask (logxor shifted-set-mask #b11111111111111111111111111111111))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-base))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
|
|
|
|
|
(info (append-text info (wrap-as (i386:base-mem->accu))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-and clear-mask))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu->base))))
|
|
|
|
|
|
|
|
|
|
(info (append-text info (wrap-as (i386:pop-accu))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-and set-mask))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-shl bit))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu-or-base))))
|
|
|
|
|
|
|
|
|
|
(info (append-text info (wrap-as (i386:pop-base)))))
|
|
|
|
|
info))))
|
2018-05-13 11:50:32 +00:00
|
|
|
|
(accu->base-mem*n info (min size (max 4 size-b)))))))) ;; FIXME: long long = int
|
|
|
|
|
|
|
|
|
|
(_ (error "expr->accu: not supported: " o))))
|
|
|
|
|
|
|
|
|
|
(let ((info (helper)))
|
|
|
|
|
(if (null? (.post info)) info
|
|
|
|
|
(append-text (clone info #:post '()) (.post info))))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
mescc: Tinycc support: Char and short sign extend.
* module/mes/as-i386.mes (i386:accu*n->local, i386:byte-accu->local+n,
i386:word-accu->local+n): Remove.
(i386:byte-accu, i386:signed-byte-accu, i386:word-accu,
i386:signed-word-accu): New function.
* module/mes/as-i386.scm: Export them.
* module/language/c99/compiler.mes (accu->local+n-text): Simplify.
(mem->accu, convert-accu): New function.
(expr->accu): Use them.
* stage0/x86.M1 (mov____%al,0x32(%ebp), mov____%al,0x8(%ebp),
mov____%ax,0x32(%ebp), mov____%ax,0x8(%ebp), movzbl_0x32(%ebp),%eax,
movzbl_0x8(%ebp),%eax, movzwl_0x32(%ebp),%eax,
movzwl_0x8(%ebp),%eax): Deprecate.
* scaffold/tests/7r-sign-extend.c: Test it.
* build-aux/check-mescc.sh (tests): Run it.
2018-05-18 21:58:10 +00:00
|
|
|
|
(define (mem->accu type)
|
|
|
|
|
(let ((size (->size type)))
|
|
|
|
|
(case size
|
|
|
|
|
((1) (append (wrap-as (i386:byte-mem->accu)) (convert-accu type)))
|
|
|
|
|
((2) (append (wrap-as (i386:word-mem->accu)) (convert-accu type)))
|
|
|
|
|
((4) (wrap-as (i386:mem->accu)))
|
|
|
|
|
(else '()))))
|
|
|
|
|
|
|
|
|
|
(define (convert-accu type)
|
|
|
|
|
(if (not (type? type)) '()
|
|
|
|
|
(let ((sign (signed? type))
|
|
|
|
|
(size (->size type)))
|
|
|
|
|
(cond ((and (= size 1) sign)
|
|
|
|
|
(wrap-as (i386:signed-byte-accu)))
|
|
|
|
|
((= size 1)
|
|
|
|
|
(wrap-as (i386:byte-accu)))
|
|
|
|
|
((and (= size 2) sign)
|
|
|
|
|
(wrap-as (i386:signed-word-accu)))
|
|
|
|
|
((= size 1)
|
|
|
|
|
(wrap-as (i386:word-accu)))
|
|
|
|
|
(else '())))))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (expr->base o info)
|
|
|
|
|
(let* ((info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(info (expr->accu o info))
|
|
|
|
|
(info (append-text info (wrap-as (append (i386:accu->base) (i386:pop-accu))))))
|
|
|
|
|
info))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (binop->accu info)
|
|
|
|
|
(lambda (a b c)
|
|
|
|
|
(let* ((info (expr->accu a info))
|
2018-05-11 22:20:51 +00:00
|
|
|
|
(info (expr->base b info)))
|
|
|
|
|
(append-text info (wrap-as c)))))
|
|
|
|
|
|
|
|
|
|
(define (binop->accu* info)
|
|
|
|
|
(lambda (a b c)
|
|
|
|
|
(let* ((info (expr->accu* a info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(info (expr->base b info)))
|
|
|
|
|
(append-text info (wrap-as c)))))
|
|
|
|
|
|
|
|
|
|
(define (wrap-as o . annotation)
|
|
|
|
|
`(,@annotation ,o))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (expr->base* o info)
|
|
|
|
|
(let* ((info (append-text info (wrap-as (i386:push-accu))))
|
|
|
|
|
(info (expr->accu* o info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:accu->base))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:pop-accu)))))
|
|
|
|
|
info))
|
2017-01-03 11:45:47 +00:00
|
|
|
|
|
2018-04-29 16:38:57 +00:00
|
|
|
|
(define (comment? o)
|
|
|
|
|
(and (pair? o) (pair? (car o)) (eq? (caar o) #:comment)))
|
|
|
|
|
|
2017-06-12 19:00:50 +00:00
|
|
|
|
(define (test-jump-label->info info label)
|
|
|
|
|
(define (jump type . test)
|
|
|
|
|
(lambda (o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let* ((info (ast->info o info))
|
2017-06-25 07:33:55 +00:00
|
|
|
|
(info (append-text info (make-comment "jmp test LABEL")))
|
|
|
|
|
(jump-text (wrap-as (type label))))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
(append-text info (append (if (null? test) '() (car test))
|
|
|
|
|
jump-text)))))
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(pmatch o
|
2017-11-16 04:52:47 +00:00
|
|
|
|
((expr) info)
|
2018-05-19 09:41:53 +00:00
|
|
|
|
((le ,a ,b) ((jump i386:jump-z) o))
|
|
|
|
|
((lt ,a ,b) ((jump i386:jump-z) o))
|
|
|
|
|
((ge ,a ,b) ((jump i386:jump-z) o))
|
|
|
|
|
((gt ,a ,b) ((jump i386:jump-z) o))
|
2017-06-13 18:31:03 +00:00
|
|
|
|
((ne ,a ,b) ((jump i386:jump-nz) o))
|
|
|
|
|
((eq ,a ,b) ((jump i386:jump-nz) o))
|
|
|
|
|
((not _) ((jump i386:jump-z) o))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
|
|
|
|
|
((and ,a ,b)
|
|
|
|
|
(let* ((info ((test-jump-label->info info label) a))
|
|
|
|
|
(info ((test-jump-label->info info label) b)))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((or ,a ,b)
|
2018-04-29 16:38:57 +00:00
|
|
|
|
(let* ((here (number->string (length (if mes? (.text info)
|
|
|
|
|
(filter (negate comment?) (.text info))))))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
(skip-b-label (string-append label "_skip_b_" here))
|
|
|
|
|
(b-label (string-append label "_b_" here))
|
|
|
|
|
(info ((test-jump-label->info info b-label) a))
|
2017-06-25 07:33:55 +00:00
|
|
|
|
(info (append-text info (wrap-as (i386:jump skip-b-label))))
|
2017-07-02 14:25:14 +00:00
|
|
|
|
(info (append-text info (wrap-as `((#:label ,b-label)))))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
(info ((test-jump-label->info info label) b))
|
2017-07-02 14:25:14 +00:00
|
|
|
|
(info (append-text info (wrap-as `((#:label ,skip-b-label))))))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
info))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((array-ref ,index ,expr) (let* ((rank (expr->rank info expr))
|
|
|
|
|
(size (if (= rank 1) (ast-type->size info expr)
|
2017-07-23 06:44:48 +00:00
|
|
|
|
4)))
|
|
|
|
|
((jump (if (= size 1) i386:jump-byte-z
|
|
|
|
|
i386:jump-z)
|
|
|
|
|
(wrap-as (i386:accu-zero?))) o)))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((de-ref ,expr) (let* ((rank (expr->rank info expr))
|
|
|
|
|
(size (if (= rank 1) (ast-type->size info expr)
|
2017-07-23 06:44:48 +00:00
|
|
|
|
4)))
|
|
|
|
|
((jump (if (= size 1) i386:jump-byte-z
|
|
|
|
|
i386:jump-z)
|
|
|
|
|
(wrap-as (i386:accu-zero?))) o)))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
|
|
|
|
|
((assn-expr (p-expr (ident ,name)) ,op ,expr)
|
2017-06-13 18:31:03 +00:00
|
|
|
|
((jump i386:jump-z
|
2017-06-12 19:00:50 +00:00
|
|
|
|
(append ((ident->accu info) name)
|
|
|
|
|
(wrap-as (i386:accu-zero?)))) o))
|
|
|
|
|
|
2017-06-13 18:31:03 +00:00
|
|
|
|
(_ ((jump i386:jump-z (wrap-as (i386:accu-zero?))) o)))))
|
2017-06-12 19:00:50 +00:00
|
|
|
|
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(define (cstring->int o)
|
|
|
|
|
(let ((o (cond ((string-suffix? "ULL" o) (string-drop-right o 3))
|
|
|
|
|
((string-suffix? "UL" o) (string-drop-right o 2))
|
|
|
|
|
((string-suffix? "LL" o) (string-drop-right o 2))
|
|
|
|
|
((string-suffix? "L" o) (string-drop-right o 1))
|
|
|
|
|
(else o))))
|
|
|
|
|
(or (cond ((string-prefix? "0x" o) (string->number (string-drop o 2) 16))
|
|
|
|
|
((string-prefix? "0b" o) (string->number (string-drop o 2) 2))
|
|
|
|
|
((string-prefix? "0" o) (string->number o 8))
|
|
|
|
|
(else (string->number o)))
|
|
|
|
|
(error "cstring->int: not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (cstring->float o)
|
|
|
|
|
(or (string->number o)
|
|
|
|
|
(error "cstring->float: not supported:" o)))
|
2017-01-17 18:03:08 +00:00
|
|
|
|
|
2018-05-11 17:27:33 +00:00
|
|
|
|
(define (try-expr->number info o)
|
2017-07-23 19:58:34 +00:00
|
|
|
|
(pmatch o
|
2018-05-18 13:28:05 +00:00
|
|
|
|
((fixed ,a) (cstring->int a))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((p-expr ,expr) (expr->number info expr))
|
2017-07-23 19:58:34 +00:00
|
|
|
|
((neg ,a)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(- (expr->number info a)))
|
2017-07-23 19:58:34 +00:00
|
|
|
|
((add ,a ,b)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(+ (expr->number info a) (expr->number info b)))
|
2017-08-27 10:57:50 +00:00
|
|
|
|
((bitwise-and ,a ,b)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(logand (expr->number info a) (expr->number info b)))
|
2017-08-27 10:57:50 +00:00
|
|
|
|
((bitwise-not ,a)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(lognot (expr->number info a)))
|
2017-07-24 13:22:51 +00:00
|
|
|
|
((bitwise-or ,a ,b)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(logior (expr->number info a) (expr->number info b)))
|
2017-07-23 19:58:34 +00:00
|
|
|
|
((div ,a ,b)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(quotient (expr->number info a) (expr->number info b)))
|
2017-07-23 19:58:34 +00:00
|
|
|
|
((mul ,a ,b)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(* (expr->number info a) (expr->number info b)))
|
2017-07-23 19:58:34 +00:00
|
|
|
|
((sub ,a ,b)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(- (expr->number info a) (expr->number info b)))
|
2018-05-11 15:13:07 +00:00
|
|
|
|
((sizeof-type ,type)
|
|
|
|
|
(->size (ast->type type info)))
|
|
|
|
|
((sizeof-expr ,expr)
|
|
|
|
|
(->size (ast->type expr info)))
|
2017-07-30 12:28:19 +00:00
|
|
|
|
((lshift ,x ,y)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(ash (expr->number info x) (expr->number info y)))
|
2017-07-30 12:28:19 +00:00
|
|
|
|
((rshift ,x ,y)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(ash (expr->number info x) (- (expr->number info y))))
|
2017-07-24 13:22:51 +00:00
|
|
|
|
((p-expr (ident ,name))
|
|
|
|
|
(let ((value (assoc-ref (.constants info) name)))
|
|
|
|
|
(or value
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(error (format #f "expr->number: undeclared identifier: ~s\n" o)))))
|
|
|
|
|
((cast ,type ,expr) (expr->number info expr))
|
2017-08-27 10:57:50 +00:00
|
|
|
|
((cond-expr ,test ,then ,else)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(if (p-expr->bool info test) (expr->number info then) (expr->number info else)))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(,string (guard (string? string)) (cstring->int string))
|
2018-05-11 17:27:33 +00:00
|
|
|
|
((ident ,name) (assoc-ref (.constants info) name))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
|
|
|
|
(define (expr->number info o)
|
|
|
|
|
(or (try-expr->number info o)
|
|
|
|
|
(error (format #f "expr->number: not supported: ~s\n" o))))
|
2017-07-23 19:58:34 +00:00
|
|
|
|
|
2017-08-27 10:57:50 +00:00
|
|
|
|
(define (p-expr->bool info o)
|
|
|
|
|
(pmatch o
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
((eq ,a ,b) (eq? (expr->number info a) (expr->number info b)))))
|
2017-08-27 10:57:50 +00:00
|
|
|
|
|
2017-07-16 17:00:01 +00:00
|
|
|
|
(define (struct-field info)
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(pmatch o
|
2018-05-10 15:11:21 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ident ,name))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(list (cons name (ast->type type info))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ptr-declr ,pointer (ident ,name)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((rank (pointer->rank pointer)))
|
|
|
|
|
(list (cons name (rank+= (ast->type type info) rank)))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ftn-declr (scope (ptr-declr ,pointer (ident ,name))) _))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((rank (pointer->rank pointer)))
|
|
|
|
|
(list (cons name (rank+= (ast->type type info) rank)))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (ptr-declr ,pointer (array-of (ident ,name) ,count)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((rank (pointer->rank pointer))
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
(count (expr->number info count)))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(list (cons name (make-c-array (rank+= type rank) count)))))
|
2017-07-25 23:13:33 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (array-of (ident ,name) ,count))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(let ((count (expr->number info count)))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(list (cons name (make-c-array (ast->type type info) count)))))
|
2017-08-10 19:36:49 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec (struct-def (field-list . ,fields)))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(let ((fields (append-map (struct-field info) fields)))
|
|
|
|
|
(list (cons 'struct (make-type 'struct (apply + (map field:size fields)) fields)))))
|
2017-07-22 18:40:41 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec (union-def (field-list . ,fields)))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
(let ((fields (append-map (struct-field info) fields)))
|
|
|
|
|
(list (cons 'union (make-type 'union (apply + (map field:size fields)) fields)))))
|
2018-05-13 15:05:28 +00:00
|
|
|
|
((comp-decl (decl-spec-list (type-spec ,type)) (comp-declr-list (comp-declr (bit-field (ident ,name) (p-expr (fixed ,bits)))) . ,fields))
|
|
|
|
|
(let ((type (ast->type type info)))
|
|
|
|
|
(list (cons 'bits (let loop ((o `((comp-declr (bit-field (ident ,name) (p-expr (fixed ,bits)))) . ,fields)) (bit 0))
|
|
|
|
|
(if (null? o) '()
|
|
|
|
|
(let ((field (car o)))
|
|
|
|
|
(pmatch field
|
|
|
|
|
((comp-declr (bit-field (ident ,name) (p-expr (fixed ,bits))))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(let ((bits (cstring->int bits)))
|
2018-05-13 15:05:28 +00:00
|
|
|
|
(cons (cons name (make-bit-field type bit bits))
|
|
|
|
|
(loop (cdr o) (+ bit bits)))))
|
|
|
|
|
(_ (error "struct-field: not supported:" field o))))))))))
|
2018-05-10 15:11:21 +00:00
|
|
|
|
((comp-decl (decl-spec-list ,type) (comp-declr-list . ,decls))
|
|
|
|
|
(append-map (lambda (o)
|
|
|
|
|
((struct-field info) `(comp-decl (decl-spec-list ,type) (comp-declr-list ,o))))
|
|
|
|
|
decls))
|
2018-05-04 11:58:27 +00:00
|
|
|
|
(_ (error "struct-field: not supported: " o)))))
|
mescc: Support globals.
* module/language/c99/compiler.mes (write-any): Catch writing of
procedure and give more debug information.
(ref-local, ref-global): Remove.
(push-global-ref, push-global, push-ident-ref): New functions.
(push-ident): New function.
(expr->arg): Use them.
(ident->accu, ident->accu, accu->ident, value->ident, ident->base):
Take info parameter, also handle globals.
(ident-address->accu, ident->global, cstring->number): New functions.
(ast->info): Update.
* module/mes/libc-i386.mes (i386:ret-local): Remove.
(i386:push-global-ref): Rename from i386:ref-global.
(i386:push-local): Rename from i386:ref-local.
(i386:value->local): Rename from i386:local-assign.
(i386:push-global, i386:push-local-ref, i386:value->global,
i386:local-address->accu): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-10 19:12:06 +00:00
|
|
|
|
|
2017-07-15 09:46:13 +00:00
|
|
|
|
(define (local-var? o) ;; formals < 0, locals > 0
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
(positive? (local:id o)))
|
|
|
|
|
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(define (ptr-declr->rank o)
|
2017-07-12 04:55:05 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
((pointer) 1)
|
|
|
|
|
((pointer (pointer)) 2)
|
2017-07-25 09:11:26 +00:00
|
|
|
|
((pointer (pointer (pointer))) 3)
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(_ (error "ptr-declr->rank not supported: " o))))
|
2017-07-12 04:55:05 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (ast->info o info)
|
|
|
|
|
(let ((functions (.functions info))
|
|
|
|
|
(globals (.globals info))
|
|
|
|
|
(locals (.locals info))
|
|
|
|
|
(constants (.constants info))
|
|
|
|
|
(types (.types info))
|
|
|
|
|
(text (.text info)))
|
|
|
|
|
(pmatch o
|
|
|
|
|
(((trans-unit . _) . _) (ast-list->info o info))
|
|
|
|
|
((trans-unit . ,_) (ast-list->info _ info))
|
|
|
|
|
((fctn-defn . ,_) (fctn-defn->info _ info))
|
|
|
|
|
|
|
|
|
|
((cpp-stmt (define (name ,name) (repl ,value)))
|
|
|
|
|
info)
|
|
|
|
|
|
|
|
|
|
((cast (type-name (decl-spec-list (type-spec (void)))) _)
|
|
|
|
|
info)
|
|
|
|
|
|
|
|
|
|
((break)
|
|
|
|
|
(let ((label (car (.break info))))
|
|
|
|
|
(append-text info (wrap-as (i386:jump label)))))
|
|
|
|
|
|
|
|
|
|
((continue)
|
|
|
|
|
(let ((label (car (.continue info))))
|
|
|
|
|
(append-text info (wrap-as (i386:jump label)))))
|
|
|
|
|
|
|
|
|
|
;; FIXME: expr-stmt wrapper?
|
|
|
|
|
(trans-unit info)
|
|
|
|
|
((expr-stmt) info)
|
|
|
|
|
|
|
|
|
|
((compd-stmt (block-item-list . ,_)) (ast-list->info _ info))
|
|
|
|
|
|
|
|
|
|
((asm-expr ,gnuc (,null ,arg0 . string))
|
|
|
|
|
(append-text info (wrap-as (asm->m1 arg0))))
|
|
|
|
|
|
|
|
|
|
((expr-stmt (fctn-call (p-expr (ident ,name)) (expr-list . ,expr-list)))
|
|
|
|
|
(if (equal? name "asm") (let ((arg0 (cadr (cadar expr-list))))
|
|
|
|
|
(append-text info (wrap-as (asm->m1 arg0))))
|
|
|
|
|
(let* ((info (append-text info (ast->comment o)))
|
|
|
|
|
(info (expr->accu `(fctn-call (p-expr (ident ,name)) (expr-list . ,expr-list)) info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu-zero?))))))
|
|
|
|
|
|
|
|
|
|
((if ,test ,then)
|
|
|
|
|
(let* ((info (append-text info (ast->comment `(if ,test (ellipsis)))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(else-label (string-append label "else"))
|
|
|
|
|
(info ((test-jump-label->info info break-label) test))
|
|
|
|
|
(info (ast->info then info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump break-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
(clone info
|
|
|
|
|
#:locals locals)))
|
|
|
|
|
|
|
|
|
|
((if ,test ,then ,else)
|
|
|
|
|
(let* ((info (append-text info (ast->comment `(if ,test (ellipsis) (ellipsis)))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(else-label (string-append label "else"))
|
|
|
|
|
(info ((test-jump-label->info info else-label) test))
|
|
|
|
|
(info (ast->info then info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump break-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,else-label)))))
|
|
|
|
|
(info (ast->info else info))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
(clone info
|
|
|
|
|
#:locals locals)))
|
|
|
|
|
|
|
|
|
|
;; Hmm?
|
|
|
|
|
((expr-stmt (cond-expr ,test ,then ,else))
|
|
|
|
|
(let* ((info (append-text info (ast->comment `(cond-expr ,test (ellipsis) (ellipsis)))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(else-label (string-append label "else"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(info ((test-jump-label->info info else-label) test))
|
|
|
|
|
(info (ast->info then info))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump break-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,else-label)))))
|
|
|
|
|
(info (ast->info else info))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
((switch ,expr (compd-stmt (block-item-list . ,statements)))
|
2018-05-17 05:40:01 +00:00
|
|
|
|
(define (clause? o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((case . _) 'case)
|
|
|
|
|
((default . _) 'default)
|
|
|
|
|
((labeled-stmt _ ,statement) (clause? statement))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
(define clause-number
|
|
|
|
|
(let ((i 0))
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(let ((n i))
|
|
|
|
|
(when (clause? (car o))
|
|
|
|
|
(set! i (1+ i)))
|
|
|
|
|
n))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let* ((info (append-text info (ast->comment `(switch ,expr (compd-stmt (block-item-list (ellipsis)))))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(info (expr->accu expr info))
|
|
|
|
|
(info (clone info #:break (cons break-label (.break info))))
|
2018-05-17 05:40:01 +00:00
|
|
|
|
(count (length (filter clause? statements)))
|
|
|
|
|
(default? (find (cut eq? <> 'default) (map clause? statements)))
|
|
|
|
|
(info (fold (cut switch->info #t label (1- count) <> <> <>) info statements
|
|
|
|
|
(unfold null? clause-number cdr statements)))
|
|
|
|
|
(last-clause-label (string-append label "clause" (number->string count)))
|
|
|
|
|
(default-label (string-append label "default"))
|
|
|
|
|
(info (if (not default?) info
|
|
|
|
|
(append-text info (wrap-as (i386:jump break-label)))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,last-clause-label)))))
|
|
|
|
|
(info (if (not default?) info
|
|
|
|
|
(append-text info (wrap-as (i386:jump default-label)))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
(clone info
|
|
|
|
|
#:locals locals
|
|
|
|
|
#:break (cdr (.break info)))))
|
|
|
|
|
|
|
|
|
|
((for ,init ,test ,step ,body)
|
|
|
|
|
(let* ((info (append-text info (ast->comment `(for ,init ,test ,step (ellipsis)))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(loop-label (string-append label "loop"))
|
|
|
|
|
(continue-label (string-append label "continue"))
|
|
|
|
|
(initial-skip-label (string-append label "initial_skip"))
|
|
|
|
|
(info (ast->info init info))
|
|
|
|
|
(info (clone info #:break (cons break-label (.break info))))
|
|
|
|
|
(info (clone info #:continue (cons continue-label (.continue info))))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump initial-skip-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,loop-label)))))
|
|
|
|
|
(info (ast->info body info))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,continue-label)))))
|
|
|
|
|
(info (expr->accu step info))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,initial-skip-label)))))
|
|
|
|
|
(info ((test-jump-label->info info break-label) test))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump loop-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
(clone info
|
|
|
|
|
#:locals locals
|
|
|
|
|
#:break (cdr (.break info))
|
|
|
|
|
#:continue (cdr (.continue info)))))
|
|
|
|
|
|
|
|
|
|
((while ,test ,body)
|
|
|
|
|
(let* ((info (append-text info (ast->comment `(while ,test (ellipsis)))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(loop-label (string-append label "loop"))
|
|
|
|
|
(continue-label (string-append label "continue"))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump continue-label))))
|
|
|
|
|
(info (clone info #:break (cons break-label (.break info))))
|
|
|
|
|
(info (clone info #:continue (cons continue-label (.continue info))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,loop-label)))))
|
|
|
|
|
(info (ast->info body info))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,continue-label)))))
|
|
|
|
|
(info ((test-jump-label->info info break-label) test))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump loop-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
(clone info
|
|
|
|
|
#:locals locals
|
|
|
|
|
#:break (cdr (.break info))
|
|
|
|
|
#:continue (cdr (.continue info)))))
|
|
|
|
|
|
|
|
|
|
((do-while ,body ,test)
|
|
|
|
|
(let* ((info (append-text info (ast->comment `(do-while ,test (ellipsis)))))
|
|
|
|
|
(here (number->string (length text)))
|
|
|
|
|
(label (string-append "_" (.function info) "_" here "_"))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(loop-label (string-append label "loop"))
|
|
|
|
|
(continue-label (string-append label "continue"))
|
|
|
|
|
(info (clone info #:break (cons break-label (.break info))))
|
|
|
|
|
(info (clone info #:continue (cons continue-label (.continue info))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,loop-label)))))
|
|
|
|
|
(info (ast->info body info))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,continue-label)))))
|
|
|
|
|
(info ((test-jump-label->info info break-label) test))
|
|
|
|
|
(info (append-text info (wrap-as (i386:jump loop-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,break-label))))))
|
|
|
|
|
(clone info
|
|
|
|
|
#:locals locals
|
|
|
|
|
#:break (cdr (.break info))
|
|
|
|
|
#:continue (cdr (.continue info)))))
|
|
|
|
|
|
|
|
|
|
((labeled-stmt (ident ,label) ,statement)
|
|
|
|
|
(let ((info (append-text info `(((#:label ,(string-append "_" (.function info) "_label_" label)))))))
|
|
|
|
|
(ast->info statement info)))
|
|
|
|
|
|
|
|
|
|
((goto (ident ,label))
|
|
|
|
|
(append-text info (wrap-as (i386:jump (string-append "_" (.function info) "_label_" label)))))
|
|
|
|
|
|
|
|
|
|
((return ,expr)
|
|
|
|
|
(let ((info (expr->accu expr info)))
|
|
|
|
|
(append-text info (append (wrap-as (i386:ret))))))
|
|
|
|
|
|
|
|
|
|
((decl . ,decl)
|
|
|
|
|
;;FIXME: ridiculous performance hit with mes
|
2018-05-11 11:34:45 +00:00
|
|
|
|
;; Nyacc 0.80.42: missing (enum-ref (ident "fred"))
|
2018-05-17 05:40:01 +00:00
|
|
|
|
(let ( ;;(info (append-text info (ast->comment o)))
|
2018-05-11 11:34:45 +00:00
|
|
|
|
)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(decl->info info decl)))
|
|
|
|
|
;; ...
|
|
|
|
|
((gt . _) (expr->accu o info))
|
|
|
|
|
((ge . _) (expr->accu o info))
|
|
|
|
|
((ne . _) (expr->accu o info))
|
|
|
|
|
((eq . _) (expr->accu o info))
|
|
|
|
|
((le . _) (expr->accu o info))
|
|
|
|
|
((lt . _) (expr->accu o info))
|
|
|
|
|
((lshift . _) (expr->accu o info))
|
|
|
|
|
((rshift . _) (expr->accu o info))
|
|
|
|
|
|
|
|
|
|
;; EXPR
|
|
|
|
|
((expr-stmt ,expression)
|
|
|
|
|
(let ((info (expr->accu expression info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu-zero?)))))
|
|
|
|
|
|
|
|
|
|
;; FIXME: why do we get (post-inc ...) here
|
|
|
|
|
;; (array-ref
|
|
|
|
|
(_ (let ((info (expr->accu o info)))
|
|
|
|
|
(append-text info (wrap-as (i386:accu-zero?))))))))
|
|
|
|
|
|
|
|
|
|
(define (ast-list->info o info)
|
|
|
|
|
(fold ast->info info o))
|
|
|
|
|
|
2018-05-17 05:40:01 +00:00
|
|
|
|
(define (switch->info clause? label count o i info)
|
|
|
|
|
(let* ((i-string (number->string i))
|
|
|
|
|
(i+1-string (number->string (1+ i)))
|
|
|
|
|
(body-label (string-append label "body" i-string))
|
|
|
|
|
(clause-label (string-append label "clause" i-string))
|
|
|
|
|
(last? (= i count))
|
|
|
|
|
(break-label (string-append label "break"))
|
|
|
|
|
(next-clause-label (string-append label "clause" i+1-string))
|
|
|
|
|
(default-label (string-append label "default")))
|
|
|
|
|
(define (jump label)
|
|
|
|
|
(wrap-as (i386:jump label)))
|
|
|
|
|
(pmatch o
|
|
|
|
|
((case ,test)
|
|
|
|
|
(define (jump-nz label)
|
|
|
|
|
(wrap-as (i386:jump-nz label)))
|
|
|
|
|
(define (jump-z label)
|
|
|
|
|
(wrap-as (i386:jump-z label)))
|
|
|
|
|
(define (test->text test)
|
|
|
|
|
(let ((value (pmatch test
|
|
|
|
|
(0 0)
|
|
|
|
|
((p-expr (char ,value)) (char->integer (car (string->list value))))
|
|
|
|
|
((p-expr (ident ,constant)) (assoc-ref (.constants info) constant))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
((p-expr (fixed ,value)) (cstring->int value))
|
|
|
|
|
((neg (p-expr (fixed ,value))) (- (cstring->int value)))
|
2018-05-17 05:40:01 +00:00
|
|
|
|
(_ (error "case test: not supported: " test)))))
|
|
|
|
|
(append (wrap-as (i386:accu-cmp-value value))
|
|
|
|
|
(jump-z body-label))))
|
|
|
|
|
(let ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info)))
|
|
|
|
|
(append-text info (test->text test))))
|
|
|
|
|
((case ,test (case . ,case1))
|
|
|
|
|
(let ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info)))
|
|
|
|
|
(fold (cut switch->info #f label count <> i <>) info (cons `(case ,test) `((case ,@case1))))))
|
|
|
|
|
((case ,test (default . ,rest))
|
|
|
|
|
(let ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info)))
|
|
|
|
|
(fold (cut switch->info #f label count <> i <>) info (cons `(case ,test) `(default ,@rest)))))
|
|
|
|
|
((case ,test ,statement)
|
|
|
|
|
(let* ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info))
|
|
|
|
|
(info (switch->info #f label count `(case ,test) i info))
|
|
|
|
|
(info (append-text info (jump next-clause-label)))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,body-label))))))
|
|
|
|
|
(ast->info statement info)))
|
|
|
|
|
((case ,test (case . ,case1) . ,rest)
|
|
|
|
|
(let ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info)))
|
|
|
|
|
(fold (cut switch->info #f label count <> i <>) info (cons `(case ,test) `((case ,@case1) ,@rest)))))
|
|
|
|
|
((default (case . ,case1) . ,rest)
|
|
|
|
|
(let* ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info))
|
|
|
|
|
(info (if last? info
|
|
|
|
|
(append-text info (jump next-clause-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,default-label)))))
|
|
|
|
|
(info (append-text info (jump body-label))))
|
|
|
|
|
(fold (cut switch->info #f label count <> i <>) info `((case ,@case1) ,@rest))))
|
|
|
|
|
(default
|
|
|
|
|
(let* ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info))
|
|
|
|
|
(info (if last? info
|
|
|
|
|
(append-text info (jump next-clause-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,default-label))))))
|
|
|
|
|
(append-text info (jump body-label))))
|
|
|
|
|
((default ,statement)
|
|
|
|
|
(let* ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info))
|
|
|
|
|
(info (if last? info
|
|
|
|
|
(append-text info (jump next-clause-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,body-label)))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,default-label))))))
|
|
|
|
|
(ast->info statement info)))
|
|
|
|
|
((default ,statement ,rest)
|
|
|
|
|
(let* ((info (if clause? (append-text info (wrap-as `((#:label ,clause-label))))
|
|
|
|
|
info))
|
|
|
|
|
(info (if last? info
|
|
|
|
|
(append-text info (jump next-clause-label))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,body-label)))))
|
|
|
|
|
(info (append-text info (wrap-as `((#:label ,default-label))))))
|
|
|
|
|
(fold ast->info (ast->info statement info) rest)))
|
|
|
|
|
((labeled-stmt (ident ,goto-label) ,statement)
|
|
|
|
|
(let ((info (append-text info `(((#:label ,(string-append "_" (.function info) "_label_" goto-label)))))))
|
|
|
|
|
(switch->info clause? label count statement i info)))
|
|
|
|
|
(_ (ast->info o info)))))
|
|
|
|
|
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(define (global->static function)
|
|
|
|
|
(lambda (o)
|
|
|
|
|
(cons (car o) (set-field (cdr o) (global:function) function))))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (decl->info info o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
(((decl-spec-list (type-spec ,type)) (init-declr-list . ,inits))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(let* ((info (type->info type #f info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(type (ast->type type info)))
|
|
|
|
|
(fold (cut init-declr->info type <> <>) info (map cdr inits))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((decl-spec-list (type-spec ,type)))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(type->info type #f info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((decl-spec-list (stor-spec (typedef)) (type-spec ,type)) (init-declr-list (init-declr (ident ,name))))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(let* ((info (type->info type name info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(type (ast->type type info)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(clone info #:types (acons name type (.types info)))))
|
2018-05-11 16:26:01 +00:00
|
|
|
|
;; FIXME: recursive types, pointer, array
|
|
|
|
|
(((decl-spec-list (stor-spec (typedef)) (type-spec ,type)) (init-declr-list (init-declr (array-of (ident ,name) ,count))))
|
|
|
|
|
(let* ((info (type->info type name info))
|
|
|
|
|
(type (ast->type type info))
|
|
|
|
|
(count (expr->number info count))
|
|
|
|
|
(type (make-c-array type count)))
|
|
|
|
|
(clone info #:types (acons name type (.types info)))))
|
2018-05-11 16:36:35 +00:00
|
|
|
|
(((decl-spec-list (stor-spec (typedef)) (type-spec ,type)) (init-declr-list (init-declr (ptr-declr ,pointer (ident ,name)))))
|
|
|
|
|
(let* ((info (type->info type name info))
|
|
|
|
|
(type (ast->type type info))
|
|
|
|
|
(rank (pointer->rank pointer))
|
|
|
|
|
(type (rank+= type rank)))
|
|
|
|
|
(clone info #:types (acons name type (.types info)))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((decl-spec-list (stor-spec (,store)) (type-spec ,type)) (init-declr-list . ,inits))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let* ((type (ast->type type info))
|
|
|
|
|
(function (.function info)))
|
|
|
|
|
(if (not function) (fold (cut init-declr->info type <> <>) info (map cdr inits))
|
|
|
|
|
(let* ((tmp (clone info #:function #f #:globals '()))
|
|
|
|
|
(tmp (fold (cut init-declr->info type <> <>) tmp (map cdr inits)))
|
|
|
|
|
(statics (map (global->static function) (.globals tmp)))
|
|
|
|
|
(strings (filter string-global? (.globals tmp))))
|
|
|
|
|
(clone info #:globals (append (.globals info) strings)
|
|
|
|
|
#:statics (append statics (.statics info)))))))
|
2018-05-11 16:53:54 +00:00
|
|
|
|
(((decl-spec-list (stor-spec (,store)) (type-spec ,type)))
|
|
|
|
|
(type->info type #f info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((@ . _))
|
|
|
|
|
(stderr "decl->info: skip: ~s\n" o)
|
|
|
|
|
info)
|
|
|
|
|
(_ (error "decl->info: not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (ast->name o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((ident ,name) name)
|
|
|
|
|
((array-of ,array . ,_) (ast->name array))
|
2018-05-11 17:46:26 +00:00
|
|
|
|
((ftn-declr (scope (ptr-declr ,pointer (ident ,name))) . _) name)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((ptr-declr ,pointer ,decl . ,_) (ast->name decl))
|
2018-05-11 17:46:26 +00:00
|
|
|
|
((ptr-declr ,pointer (ident ,name)) name)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (error "ast->name not supported: " o))))
|
2018-05-04 11:58:27 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (init-declr->count info o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((array-of (ident ,name) ,count) (expr->number info count))
|
|
|
|
|
(_ #f)))
|
2017-01-04 23:55:46 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (init->accu o info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((initzer-list (initzer ,expr)) (expr->accu expr info))
|
|
|
|
|
(((#:string ,string))
|
|
|
|
|
(append-text info (list (i386:label->accu `(#:string ,string)))))
|
|
|
|
|
((,number . _) (guard (number? number))
|
|
|
|
|
(append-text info (wrap-as (i386:value->accu 0))))
|
|
|
|
|
((,c . ,_) (guard (char? c)) info)
|
|
|
|
|
(_ (expr->accu o info))))
|
|
|
|
|
|
|
|
|
|
(define (init-struct-field local field init info)
|
|
|
|
|
(let* ((offset (field-offset info (local:type local) (car field)))
|
|
|
|
|
(size (field:size field))
|
|
|
|
|
(empty (clone info #:text '())))
|
|
|
|
|
(clone info #:text
|
|
|
|
|
(append
|
|
|
|
|
(.text info)
|
|
|
|
|
(local->accu local)
|
|
|
|
|
(wrap-as (append (i386:accu->base)))
|
|
|
|
|
(wrap-as (append (i386:push-base)))
|
|
|
|
|
(.text (expr->accu init empty))
|
|
|
|
|
(wrap-as (append (i386:pop-base)))
|
|
|
|
|
(wrap-as (case size
|
|
|
|
|
((1) (i386:byte-accu->base-mem+n offset))
|
|
|
|
|
((2) (i386:word-accu->base-mem+n offset))
|
|
|
|
|
(else (i386:accu->base-mem+n offset))))))))
|
|
|
|
|
|
|
|
|
|
(define (init-array-entry local index init info)
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(let* ((type (local:type local))
|
|
|
|
|
(size (cond ((pointer? type) %pointer-size)
|
|
|
|
|
((and (c-array? type) ((compose pointer? c-array:type) type)) %pointer-size)
|
|
|
|
|
((c-array? type) ((compose type:size c-array:type) type))
|
|
|
|
|
(else (type:size type))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(offset (* index size))
|
|
|
|
|
(empty (clone info #:text '())))
|
|
|
|
|
(clone info #:text
|
|
|
|
|
(append
|
|
|
|
|
(.text info)
|
|
|
|
|
(local->accu local)
|
|
|
|
|
(wrap-as (append (i386:accu->base)))
|
|
|
|
|
(wrap-as (append (i386:push-base)))
|
|
|
|
|
(.text (expr->accu init empty))
|
|
|
|
|
(wrap-as (append (i386:pop-base)))
|
|
|
|
|
(wrap-as (case size
|
|
|
|
|
((1) (i386:byte-accu->base-mem+n offset))
|
|
|
|
|
((2) (i386:word-accu->base-mem+n offset))
|
|
|
|
|
(else (i386:accu->base-mem+n offset))))))))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (init-local local o n info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
(#f info)
|
|
|
|
|
((initzer ,init)
|
|
|
|
|
(init-local local init n info))
|
|
|
|
|
((initzer-list ,init)
|
|
|
|
|
(init-local local init n info))
|
|
|
|
|
((initzer-list . ,inits)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let ((struct? (structured-type? local)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(cond (struct?
|
2018-05-11 13:52:30 +00:00
|
|
|
|
(let ((fields ((compose struct->init-fields local:type) local)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(fold (cut init-struct-field local <> <> <>) info fields (append inits (map (const '(p-expr (fixed "22"))) (iota (max 0 (- (length fields) (length inits)))))))))
|
|
|
|
|
(else (fold (cut init-local local <> <> <>) info inits (iota (length inits)))))))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(,string (guard (string? string))
|
|
|
|
|
(let ((inits (string->list string)))
|
|
|
|
|
(fold (cut init-array-entry local <> <> <>) info (iota (length inits)) inits)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((initzer (initzer-list . ,inits)))
|
|
|
|
|
(fold (cut init-array-entry local <> <> <>) info (iota (length inits)) inits))
|
|
|
|
|
(() info)
|
|
|
|
|
(_ (let ((info (init->accu o info)))
|
|
|
|
|
(append-text info (accu->local+n-text local n))))))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (local->info type name o init info)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let* ((locals (.locals info))
|
|
|
|
|
(id (if (or (null? locals) (not (local-var? (cdar locals)))) 1
|
|
|
|
|
(1+ (local:id (cdar locals)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(local (make-local-entry name type id))
|
|
|
|
|
(pointer (->rank (cdr local)))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(array? (or (and (c-array? type) type)
|
|
|
|
|
(and (pointer? type)
|
|
|
|
|
(c-array? (pointer:type type))
|
|
|
|
|
(pointer:type type))
|
|
|
|
|
(and (pointer? type)
|
|
|
|
|
(pointer? (pointer:type type))
|
|
|
|
|
(c-array? (pointer:type (pointer:type type)))
|
|
|
|
|
(pointer:type (pointer:type type)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(struct? (structured-type? type))
|
|
|
|
|
(size (->size type))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(string (and array? (array-init->string init)))
|
|
|
|
|
(init (or string init))
|
|
|
|
|
(local (if (not array?) local
|
|
|
|
|
(let ((size (or (and string (max size (1+ (string-length string))))
|
|
|
|
|
size)))
|
|
|
|
|
(make-local-entry name type (+ (local:id (cdr local)) -1 (quotient (+ size 3) 4))))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(local (if struct? (make-local-entry name type (+ (local:id (cdr local)) (quotient (+ size 3) 4)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
local))
|
|
|
|
|
(locals (cons local locals))
|
|
|
|
|
(info (clone info #:locals locals))
|
|
|
|
|
(local (cdr local)))
|
|
|
|
|
(init-local local init 0 info)))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (global->info type name o init info)
|
|
|
|
|
(let* ((rank (->rank type))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(size (->size type))
|
|
|
|
|
(array? (or (and (c-array? type) type)
|
|
|
|
|
(and (pointer? type)
|
|
|
|
|
(c-array? (pointer:type type))
|
|
|
|
|
(pointer:type type))
|
|
|
|
|
(and (pointer? type)
|
|
|
|
|
(pointer? (pointer:type type))
|
|
|
|
|
(c-array? (pointer:type (pointer:type type)))
|
|
|
|
|
(pointer:type (pointer:type type)))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(data (cond ((not init) (string->list (make-string size #\nul)))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(array? (let* ((string (array-init->string init))
|
|
|
|
|
(size (or (and string (max size (1+ (string-length string))))
|
|
|
|
|
size))
|
|
|
|
|
(data (or (and=> string string->list)
|
|
|
|
|
(array-init->data size init info))))
|
|
|
|
|
(append data (string->list (make-string (max 0 (- size (length data))) #\nul)))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(else (let ((data (init->data init info)))
|
|
|
|
|
(append data (string->list (make-string (max 0 (- size (length data))) #\nul)))))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(global (make-global-entry name type data)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(clone info #:globals (append (.globals info) (list global)))))
|
|
|
|
|
|
|
|
|
|
(define (array-init-element->data size o info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((initzer (p-expr (string ,string)))
|
|
|
|
|
`((#:string ,string)))
|
|
|
|
|
((initzer (p-expr (fixed ,fixed)))
|
|
|
|
|
(int->bv32 (expr->number info fixed)))
|
|
|
|
|
(_ (init->data o info))
|
|
|
|
|
;;(_ (error "array-init-element->data: not supported: " o))
|
|
|
|
|
))
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (array-init->data size o info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
(((initzer (initzer-list . ,inits)))
|
|
|
|
|
(map (cut array-init-element->data size <> info) inits))
|
2017-04-10 04:59:50 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((initzer (p-expr (string ,string)))
|
|
|
|
|
(let ((data (string->list string)))
|
|
|
|
|
(if (not size) data
|
|
|
|
|
(append data (string->list (make-string (max 0 (- size (length data))) #\nul))))))
|
2017-06-12 15:10:29 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((initzer (p-expr (string ,string))))
|
|
|
|
|
(let ((data (string->list string)))
|
|
|
|
|
(if (not size) data
|
|
|
|
|
(append data (string->list (make-string (max 0 (- size (length data))) #\nul))))))
|
|
|
|
|
|
2018-05-11 11:34:45 +00:00
|
|
|
|
(((initzer (p-expr (string . ,strings))))
|
|
|
|
|
(let ((data (string->list (apply string-append strings))))
|
|
|
|
|
(if (not size) data
|
|
|
|
|
(append data (string->list (make-string (max 0 (- size (length data))) #\nul))))))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((initzer (p-expr (fixed ,fixed)))
|
|
|
|
|
(int->bv32 (expr->number info fixed)))
|
|
|
|
|
|
|
|
|
|
(() (string->list (make-string size #\nul)))
|
|
|
|
|
(_ (error "array-init->data: not supported: " o))))
|
|
|
|
|
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(define (array-init->string o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((p-expr (string ,string)) string)
|
|
|
|
|
((p-expr (string . ,strings)) (apply string-append strings))
|
|
|
|
|
((initzer ,init) (array-init->string init))
|
|
|
|
|
(((initzer ,init)) (array-init->string init))
|
|
|
|
|
((initzer-list (initzer (p-expr (char ,c))) . ,inits)
|
|
|
|
|
(list->string (map (lambda (i) (pmatch i
|
|
|
|
|
((initzer (p-expr (char ,c))) ((compose car string->list) c))
|
|
|
|
|
((initzer (p-expr (fixed ,fixed)))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(let ((value (cstring->int fixed)))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(if (and (>= value 0) (<= value 255))
|
|
|
|
|
(integer->char value)
|
|
|
|
|
(error "array-init->string: not supported:" i o))))
|
|
|
|
|
(_ (error "array-init->string: not supported:" i o))))
|
|
|
|
|
(cdr o))))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(define (init-declr->info type o info)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
(((ident ,name))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(if (.function info) (local->info type name o #f info)
|
|
|
|
|
(global->info type name o #f info)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((ident ,name) (initzer ,init))
|
|
|
|
|
(let* ((strings (init->strings init info))
|
|
|
|
|
(info (if (null? strings) info
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(clone info #:globals (append (.globals info) strings)))))
|
|
|
|
|
(if (.function info) (local->info type name o init info)
|
|
|
|
|
(global->info type name o init info))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((ftn-declr (ident ,name) . ,_))
|
|
|
|
|
(let ((functions (.functions info)))
|
|
|
|
|
(if (member name functions) info
|
|
|
|
|
(let* ((type (ftn-declr:get-type info `(ftn-declr (ident ,name) ,@_)))
|
|
|
|
|
(function (make-function name type #f)))
|
|
|
|
|
(clone info #:functions (cons (cons name function) functions))))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(((ftn-declr (scope (ptr-declr ,pointer (ident ,name))) ,param-list) ,init)
|
|
|
|
|
(let* ((rank (pointer->rank pointer))
|
|
|
|
|
(type (rank+= type rank)))
|
|
|
|
|
(if (.function info) (local->info type name o init info)
|
|
|
|
|
(global->info type name o init info))))
|
2018-05-11 16:53:54 +00:00
|
|
|
|
(((ftn-declr (scope (ptr-declr ,pointer (ident ,name))) ,param-list))
|
|
|
|
|
(let* ((rank (pointer->rank pointer))
|
|
|
|
|
(type (rank+= type rank)))
|
|
|
|
|
(if (.function info) (local->info type name o '() info)
|
|
|
|
|
(global->info type name o '() info))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(((ptr-declr ,pointer . ,_) . ,init)
|
|
|
|
|
(let* ((rank (pointer->rank pointer))
|
|
|
|
|
(type (rank+= type rank)))
|
|
|
|
|
(init-declr->info type (append _ init) info)))
|
|
|
|
|
(((array-of (ident ,name) ,count) . ,init)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let* ((strings (init->strings init info))
|
|
|
|
|
(info (if (null? strings) info
|
|
|
|
|
(clone info #:globals (append (.globals info) strings))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(count (expr->number info count))
|
|
|
|
|
(type (make-c-array type count)))
|
|
|
|
|
(if (.function info) (local->info type name o init info)
|
|
|
|
|
(global->info type name o init info))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((array-of (ident ,name)) . ,init)
|
|
|
|
|
(let* ((strings (init->strings init info))
|
|
|
|
|
(info (if (null? strings) info
|
|
|
|
|
(clone info #:globals (append (.globals info) strings))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(count (length (cadar init)))
|
|
|
|
|
(type (make-c-array type count)))
|
|
|
|
|
(if (.function info) (local->info type name o init info)
|
|
|
|
|
(global->info type name o init info))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
;; FIXME: recursion
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(((array-of (array-of (ident ,name) ,count) ,count1) . ,init)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(let* ((strings (init->strings init info))
|
|
|
|
|
(info (if (null? strings) info
|
|
|
|
|
(clone info #:globals (append (.globals info) strings))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(count (expr->number info count))
|
2018-05-12 09:25:35 +00:00
|
|
|
|
(count1 (expr->number info count1))
|
|
|
|
|
(type (rank++ (make-c-array type (* %pointer-size count count1)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(if (.function info) (local->info type name o init info)
|
|
|
|
|
(global->info type name o init info))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (error "init-declr->info: not supported: " o))))
|
2017-04-02 09:55:37 +00:00
|
|
|
|
|
2017-05-25 05:57:26 +00:00
|
|
|
|
(define (enum-def-list->constants constants fields)
|
|
|
|
|
(let loop ((fields fields) (i 0) (constants constants))
|
2018-04-07 10:56:17 +00:00
|
|
|
|
(if (pair? fields)
|
|
|
|
|
(let ((field (car fields)))
|
|
|
|
|
(mescc:trace (cadr (cadr field)) " <e>")))
|
2017-05-25 05:57:26 +00:00
|
|
|
|
(if (null? fields) constants
|
|
|
|
|
(let* ((field (car fields))
|
|
|
|
|
(name (pmatch field
|
|
|
|
|
((enum-defn (ident ,name) . _) name)))
|
|
|
|
|
(i (pmatch field
|
2017-05-25 05:32:29 +00:00
|
|
|
|
((enum-defn ,name) i)
|
mescc: refactor expr->accu, expr->accu*, fixes nontrivial struct by value assign.
* module/language/c99/compiler.mes: (pke): New function.
(expr->number): Rename from p-expr->number. Update callers.
(decl->info, init-declr->pointer, struct-field): Several pointeryness fixes.
(expr->accu*, expr->accu): Remove special-casing for foo.bar,
foo->bar, foo[bar]. Fixes struct by value assign for non-trival
expressions.
(accu->ident, ident-address->accu, ident->accu):
(base->ident-address, ident->base): Remove.
* scaffold/tests/7k-for-each-elem.c (test): Test it.
* scaffold/tests/7c-dynarray.c (test): Test it.
* scaffold/tests/7m-struct-char-array-assign.c: Test it.
* make.scm (add-scaffold-test): Build it.
2017-11-11 12:45:53 +00:00
|
|
|
|
((enum-defn ,name ,exp) (expr->number #f exp))
|
2017-05-25 05:32:29 +00:00
|
|
|
|
(_ (error "not supported enum field=~s\n" field)))))
|
2017-05-25 05:57:26 +00:00
|
|
|
|
(loop (cdr fields)
|
|
|
|
|
(1+ i)
|
|
|
|
|
(append constants (list (ident->constant name i))))))))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (init->data o info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((p-expr ,expr) (init->data expr info))
|
|
|
|
|
((fixed ,fixed) (int->bv32 (expr->number info o)))
|
|
|
|
|
((char ,char) (int->bv32 (char->integer (string-ref char 0))))
|
|
|
|
|
((string ,string) `((#:string ,string)))
|
|
|
|
|
((string . ,strings) `((#:string ,(string-join strings ""))))
|
|
|
|
|
((ident ,name) (let ((var (ident->variable info name)))
|
|
|
|
|
`((#:address ,var))))
|
|
|
|
|
((initzer-list . ,initzers) (append-map (cut init->data <> info) initzers))
|
|
|
|
|
(((initzer (initzer-list . ,inits)))
|
|
|
|
|
(init->data `(initzer-list . ,inits) info))
|
|
|
|
|
((ref-to (p-expr (ident ,name)))
|
|
|
|
|
(let ((var (ident->variable info name)))
|
|
|
|
|
`((#:address ,var))))
|
|
|
|
|
((ref-to (i-sel (ident ,field) (cast (type-name (decl-spec-list ,struct) (abs-declr (pointer))) (p-expr (fixed ,base)))))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let* ((type (ast->type struct info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(offset (field-offset info type field))
|
2018-05-18 13:28:05 +00:00
|
|
|
|
(base (cstring->int base)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(int->bv32 (+ base offset))))
|
|
|
|
|
((,char . _) (guard (char? char)) o)
|
|
|
|
|
((,number . _) (guard (number? number))
|
|
|
|
|
(append (map int->bv32 o)))
|
|
|
|
|
((initzer ,init) (init->data init info))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(((initzer ,init)) (init->data init info))
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((cast _ ,expr) (init->data expr info))
|
2018-05-11 17:27:33 +00:00
|
|
|
|
(_ (let ((number (try-expr->number info o)))
|
|
|
|
|
(cond (number (int->bv32 number))
|
|
|
|
|
(else (error "init->data: not supported: " o)))))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
|
|
|
|
(define (init->strings o info)
|
|
|
|
|
(let ((globals (.globals info)))
|
2017-07-12 04:55:05 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
((p-expr (string ,string))
|
|
|
|
|
(let ((g `(#:string ,string)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(if (assoc g globals) '()
|
|
|
|
|
(list (string->global-entry string)))))
|
2017-07-16 20:59:07 +00:00
|
|
|
|
((p-expr (string . ,strings))
|
2017-08-04 09:45:15 +00:00
|
|
|
|
(let* ((string (string-join strings ""))
|
2017-07-16 20:59:07 +00:00
|
|
|
|
(g `(#:string ,string)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(if (assoc g globals) '()
|
|
|
|
|
(list (string->global-entry string)))))
|
|
|
|
|
(((initzer (initzer-list . ,init)))
|
|
|
|
|
(append-map (cut init->strings <> info) init))
|
|
|
|
|
((initzer ,init)
|
|
|
|
|
(init->strings init info))
|
2018-05-12 10:03:01 +00:00
|
|
|
|
(((initzer ,init))
|
|
|
|
|
(init->strings init info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((initzer-list . ,init)
|
|
|
|
|
(append-map (cut init->strings <> info) init))
|
|
|
|
|
(_ '()))))
|
2017-07-12 04:55:05 +00:00
|
|
|
|
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(define (type->info o name info)
|
mescc: Run mini-mes.
* .gitignore: Ignore tiny-mes and tiny .mo's.
* doc/examples/tiny-mes.c: Simplify.
* doc/examples/mini-mes.c: Use simplifications from tiny-mes.
* doc/examples/t.c (read_test, struct_test): New functions.
(test): Add tests for arena, g_cells globals.
* module/mes/elf-util.mes (dec->hex): New function.
(lambda/label->list): Add text-address parameter. Update callers.
* module/language/c99/compiler.mes (make, info, clone): Add init field.
(.init): New function.
(ident->accu): Add exceptions for globals.
* module/mes/elf-util.scm: Export it.
* module/mes/libc-i386.mes (i386:accu->base-ref,
i386:byte-accu->base-ref, i386:accu->base-ref+n,
i386:accu->global-ref, i386:global-ref->accu, i386:global-ref->base,
i386:global-add, i386:global->accu):, i386:local-ref->accu,
i386:local-ptr->accu, i386:local-ptr->base): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-29 14:22:39 +00:00
|
|
|
|
(pmatch o
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((enum-def (ident ,name) (enum-def-list . ,fields))
|
|
|
|
|
(mescc:trace name " <t>")
|
|
|
|
|
(let* ((type-entry (enum->type-entry name fields))
|
|
|
|
|
(constants (enum-def-list->constants (.constants info) fields)))
|
|
|
|
|
(clone info
|
|
|
|
|
#:types (cons type-entry (.types info))
|
|
|
|
|
#:constants (append constants (.constants info)))))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
|
|
|
|
((enum-def (enum-def-list . ,fields))
|
|
|
|
|
(mescc:trace name " <t>")
|
|
|
|
|
(let* ((type-entry (enum->type-entry name fields))
|
|
|
|
|
(constants (enum-def-list->constants (.constants info) fields)))
|
|
|
|
|
(clone info
|
|
|
|
|
#:types (cons type-entry (.types info))
|
|
|
|
|
#:constants (append constants (.constants info)))))
|
|
|
|
|
|
|
|
|
|
((struct-def (field-list . ,fields))
|
|
|
|
|
(mescc:trace name " <t>")
|
|
|
|
|
(let ((type-entry (struct->type-entry name (append-map (struct-field info) fields))))
|
|
|
|
|
(clone info #:types (cons type-entry (.types info)))))
|
|
|
|
|
|
2017-07-12 04:55:05 +00:00
|
|
|
|
((struct-def (ident ,name) (field-list . ,fields))
|
2018-04-07 10:56:17 +00:00
|
|
|
|
(mescc:trace name " <t>")
|
2018-05-04 22:14:47 +00:00
|
|
|
|
(let ((type-entry (struct->type-entry name (append-map (struct-field info) fields))))
|
2017-07-15 08:40:31 +00:00
|
|
|
|
(clone info #:types (cons type-entry (.types info)))))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((union-def (ident ,name) (field-list . ,fields))
|
|
|
|
|
(mescc:trace name " <t>")
|
|
|
|
|
(let ((type-entry (union->type-entry name (append-map (struct-field info) fields))))
|
|
|
|
|
(clone info #:types (cons type-entry (.types info)))))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
|
|
|
|
|
((union-def (field-list . ,fields))
|
|
|
|
|
(mescc:trace name " <t>")
|
|
|
|
|
(let ((type-entry (union->type-entry name (append-map (struct-field info) fields))))
|
|
|
|
|
(clone info #:types (cons type-entry (.types info)))))
|
|
|
|
|
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((enum-ref . _) info)
|
2018-05-09 19:31:23 +00:00
|
|
|
|
((struct-ref . _) info)
|
|
|
|
|
((typename ,name) info)
|
|
|
|
|
((union-ref . _) info)
|
|
|
|
|
((fixed-type . _) info)
|
2018-05-18 13:28:05 +00:00
|
|
|
|
((float-type . _) info)
|
2018-05-09 19:31:23 +00:00
|
|
|
|
((void) info)
|
|
|
|
|
|
|
|
|
|
(_ ;;(error "type->info: not supported:" o)
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(stderr "type->info: not supported: ~s\n" o)
|
2018-05-09 19:31:23 +00:00
|
|
|
|
info
|
|
|
|
|
)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
|
|
|
|
|
;;; fctn-defn
|
|
|
|
|
(define (param-decl:get-name o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((ellipsis) #f)
|
|
|
|
|
((param-decl (decl-spec-list (type-spec (void)))) #f)
|
|
|
|
|
((param-decl _ (param-declr ,ast)) (ast->name ast))
|
|
|
|
|
(_ (error "param-decl:get-name not supported:" o))))
|
2017-04-02 09:55:37 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (fctn-defn:get-name o)
|
2017-04-02 09:55:37 +00:00
|
|
|
|
(pmatch o
|
2018-05-05 10:30:06 +00:00
|
|
|
|
((_ (ftn-declr (ident ,name) _) _) name)
|
|
|
|
|
((_ (ptr-declr (pointer . _) (ftn-declr (ident ,name) _)) _) name)
|
|
|
|
|
(_ (error "fctn-defn:get-name not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (param-decl:get-type o info)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((ellipsis) #f)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
((param-decl (decl-spec-list ,type)) (ast->type type info))
|
|
|
|
|
((param-decl (decl-spec-list (type-spec ,type)) (param-declr (ptr-declr ,pointer (ident ,name))))
|
|
|
|
|
(let ((rank (pointer->rank pointer)))
|
|
|
|
|
(rank+= (ast->type type info) rank)))
|
|
|
|
|
((param-decl (decl-spec-list ,type) (param-declr (ptr-declr ,pointer (array-of _))))
|
|
|
|
|
(let ((rank (pointer->rank pointer)))
|
|
|
|
|
(rank+= (ast->type type info) (1+ rank))))
|
|
|
|
|
((param-decl ,type _) (ast->type type info))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (error "param-decl:get-type not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (fctn-defn:get-formals o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((_ (ftn-declr _ ,formals) _) formals)
|
|
|
|
|
((_ (ptr-declr (pointer . _) (ftn-declr _ ,formals)) _) formals)
|
|
|
|
|
(_ (error "fctn-defn->formals: not supported:" o))))
|
2017-04-02 09:55:37 +00:00
|
|
|
|
|
2017-01-02 06:41:56 +00:00
|
|
|
|
(define (formal->text n)
|
|
|
|
|
(lambda (o i)
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
;;(i386:formal i n)
|
|
|
|
|
'()
|
|
|
|
|
))
|
2017-04-02 09:55:37 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (param-list->text o)
|
2017-04-02 09:55:37 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
((param-list . ,formals)
|
2017-01-02 06:41:56 +00:00
|
|
|
|
(let ((n (length formals)))
|
2017-04-07 07:36:30 +00:00
|
|
|
|
(wrap-as (append (i386:function-preamble)
|
|
|
|
|
(append-map (formal->text n) formals (iota n))
|
|
|
|
|
(i386:function-locals)))))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (error "param-list->text: not supported: " o))))
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (param-list->locals o info)
|
mescc: Formals, local variables.
* module/language/c99/compiler.mes (statement->text+symbols+locals):
Rename from statement->text+symbols. Handle locals.
(formals->text): Add proper function preamble.
(formals->locals): Add formals as locals.
(expr->accu, ident->accu, ident->base, ident-ref, global-ref): New
functions.
(strlen, eputs, fputs, puts): New functions.
(libc): New variable.
(i386:libc): Rename from libc. Remove eputs and puts.
* module/mes/libc-i386.mes (i386:eputs, i386:puts: Remove.
(i386:call, i386:ret): Handle locals as argument.
(i386:function-locals, i386:function-preamble, i386:jump,
i386:local->accu, i386:local-add, i386:local-assign,
i386:local->base, i386:ref-global, i386:ref-local, i386:ret-local,
i386:mem-byte->accu, i386:test-jump, i386:write): New functions.
* module/mes/libc-i386.scm: Export them.
2017-01-02 22:21:33 +00:00
|
|
|
|
(pmatch o
|
|
|
|
|
((param-list . ,formals)
|
|
|
|
|
(let ((n (length formals)))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(map make-local-entry
|
|
|
|
|
(map param-decl:get-name formals)
|
|
|
|
|
(map (cut param-decl:get-type <> info) formals)
|
|
|
|
|
(iota n -2 -1))))
|
|
|
|
|
(_ (error "param-list->locals: not supported:" o))))
|
|
|
|
|
|
|
|
|
|
(define (fctn-defn:get-type info o)
|
2018-05-04 11:58:27 +00:00
|
|
|
|
(pmatch o
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(((decl-spec-list (type-spec ,type)) (ptr-declr ,pointer . _) ,statement)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(let* ((type (ast->type type info))
|
2018-05-09 19:31:23 +00:00
|
|
|
|
(rank (ptr-declr->rank pointer)))
|
|
|
|
|
(if (zero? rank) type
|
|
|
|
|
(make-pointer type rank))))
|
2018-05-11 11:34:45 +00:00
|
|
|
|
(((decl-spec-list (type-spec ,type)) . _)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(ast->type type info))
|
2018-05-11 11:34:45 +00:00
|
|
|
|
(((decl-spec-list (stor-spec ,store) (type-spec ,type)) . _)
|
2018-05-10 10:40:07 +00:00
|
|
|
|
(ast->type type info))
|
2018-05-11 11:34:45 +00:00
|
|
|
|
|
|
|
|
|
;; (((decl-spec-list (stor-spec ,store) (type-spec ,type)) (ftn-declr (ident _) _) _)
|
|
|
|
|
;; (ast->type type info))
|
|
|
|
|
;; (((decl-spec-list (stor-spec ,store) (type-spec ,type)) (ptr-declr ,pointer (ftn-declr (ident _) _)) _)
|
|
|
|
|
;; (ast->type type info))
|
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(_ (error "fctn-defn:get-type: not supported:" o))))
|
2017-01-04 23:55:46 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (ftn-declr:get-type info o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((ftn-declr (ident _) . _) #f)
|
|
|
|
|
(_ (error "fctn-decrl:get-type: not supported:" o))))
|
2018-01-02 20:35:55 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define (fctn-defn:get-statement o)
|
|
|
|
|
(pmatch o
|
|
|
|
|
((_ (ftn-declr (ident _) _) ,statement) statement)
|
|
|
|
|
((_ (ptr-declr (pointer . _) (ftn-declr (ident _) . _)) ,statement) statement)
|
|
|
|
|
(_ (error "fctn-defn:get-statement: not supported: " o))))
|
|
|
|
|
|
|
|
|
|
(define (fctn-defn->info o info)
|
|
|
|
|
(define (assert-return text)
|
|
|
|
|
(let ((return (wrap-as (i386:ret))))
|
|
|
|
|
(if (equal? (list-tail text (- (length text) (length return))) return) text
|
|
|
|
|
(append text return))))
|
|
|
|
|
(let ((name (fctn-defn:get-name o)))
|
|
|
|
|
(mescc:trace name)
|
|
|
|
|
(let* ((type (fctn-defn:get-type info o))
|
|
|
|
|
(formals (fctn-defn:get-formals o))
|
|
|
|
|
(text (param-list->text formals))
|
|
|
|
|
(locals (param-list->locals formals info))
|
|
|
|
|
(statement (fctn-defn:get-statement o))
|
2018-05-11 11:34:45 +00:00
|
|
|
|
(function (cons name (make-function name type '())))
|
|
|
|
|
(functions (cons function (.functions info)))
|
|
|
|
|
(info (clone info #:locals locals #:function name #:text text #:functions functions #:statics '()))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(info (ast->info statement info))
|
|
|
|
|
(locals (.locals info))
|
|
|
|
|
(local (and (pair? locals) (car locals)))
|
|
|
|
|
(count (and=> local (compose local:id cdr)))
|
|
|
|
|
(stack (and count (* count 4))))
|
|
|
|
|
(if (and stack (getenv "MESC_DEBUG")) (stderr " stack: ~a\n" stack))
|
|
|
|
|
(clone info
|
|
|
|
|
#:function #f
|
|
|
|
|
#:globals (append (.statics info) (.globals info))
|
|
|
|
|
#:statics '()
|
|
|
|
|
#:functions (append (.functions info) (list (cons name (make-function name type (assert-return (.text info))))))))))
|
|
|
|
|
|
|
|
|
|
;; exports
|
2017-04-02 09:55:37 +00:00
|
|
|
|
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(define* (c99-ast->info o)
|
|
|
|
|
(ast->info o (make <info> #:types i386:type-alist)))
|
2018-01-02 20:35:55 +00:00
|
|
|
|
|
|
|
|
|
(define* (c99-input->ast #:key (defines '()) (includes '()))
|
2018-04-06 05:18:19 +00:00
|
|
|
|
(stderr "parsing: input\n")
|
2018-01-02 20:35:55 +00:00
|
|
|
|
((compose ast-strip-const ast-strip-comment) (c99-input->full-ast #:defines defines #:includes includes)))
|
|
|
|
|
|
2017-05-17 11:56:25 +00:00
|
|
|
|
(define* (c99-input->info #:key (defines '()) (includes '()))
|
|
|
|
|
(lambda ()
|
2017-05-21 20:25:02 +00:00
|
|
|
|
(let* ((info (make <info> #:types i386:type-alist))
|
2017-05-17 11:56:25 +00:00
|
|
|
|
(ast (c99-input->ast #:defines defines #:includes includes))
|
|
|
|
|
(foo (stderr "compiling: input\n"))
|
2018-05-05 10:30:06 +00:00
|
|
|
|
(info (ast->info ast info))
|
2017-05-17 11:56:25 +00:00
|
|
|
|
(info (clone info #:text '() #:locals '())))
|
|
|
|
|
info)))
|
2017-04-12 19:27:59 +00:00
|
|
|
|
|
2017-06-11 11:11:40 +00:00
|
|
|
|
(define* (info->object o)
|
2018-04-07 08:24:57 +00:00
|
|
|
|
(stderr "compiling: object\n")
|
2018-05-04 11:58:27 +00:00
|
|
|
|
`((functions . ,(filter (compose function:text cdr) (.functions o)))
|
2018-05-04 18:45:27 +00:00
|
|
|
|
(globals . ,(.globals o))))
|
2017-05-17 11:56:25 +00:00
|
|
|
|
|
|
|
|
|
(define* (c99-input->elf #:key (defines '()) (includes '()))
|
2017-06-11 11:11:40 +00:00
|
|
|
|
((compose object->elf info->object (c99-input->info #:defines defines #:includes includes))))
|
2017-05-17 11:56:25 +00:00
|
|
|
|
|
|
|
|
|
(define* (c99-input->object #:key (defines '()) (includes '()))
|
2017-07-02 14:25:14 +00:00
|
|
|
|
((compose object->M1 info->object (c99-input->info #:defines defines #:includes includes))))
|