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

mescc: Support expression as lhs array index.

Browse source 
* module/language/c99/compiler.mes (expr->accu): Treat array index as expression.
* scaffold/t.c (struct_test): Test it.
* gc.c (gc_copy)[!__GNUC__]: Remove branch.
* vector.c (list_to_vector)[!__GNUC__]: Likewise.
This commit is contained in:
Jan Nieuwenhuizen 2017-04-05 14:24:34 +02:00
parent 71da0bfb78
commit c4fe8d8239
4 changed files with 22 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gc.c
View file

@ -77,14 +77,7 @@ gc_copy (SCM old) ///((internal))
{
NVECTOR (new) = g_free;
for (int i=0; i<LENGTH (old); i++)
#if __GNUC__
g_news[g_free++] = g_cells[VECTOR (old)+i];
#else
{
SCM b = VECTOR (old)+i;
g_news[g_free++] = g_cells[b];
}
#endif
}
TYPE (old) = TBROKEN_HEART;
CAR (old) = new;

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

@ -457,43 +457,30 @@
(i386:value->accu size))))))))
;; c+p expr->arg
;; g_cells[0]
((array-ref (p-expr (fixed ,index)) (p-expr (ident ,array)))
(let* ((index (cstring->number index))
;; g_cells[<expr>]
((array-ref ,index (p-expr (ident ,array)))
(let* ((info ((expr->accu info) index))
(type (ident->type info array))
(size (type->size info type)))
(clone info #:text
(append text
((ident->base info) array)
(list (lambda (f g ta t d)
(append
(i386:value->accu (* size index))
(case size
((1) (i386:byte-base-mem->accu))
((4) (i386:base-mem->accu))
(else (i386:accu+base))))))))))
;; c+p expr->arg
;; g_cells[i]
((array-ref (p-expr (ident ,index)) (p-expr (ident ,array)))
(let* ((type (ident->type info array))
(size (type->size info type)))
(clone info #:text (append text
((ident->base info) index)
(list (lambda (f g ta t d)
(append
(i386:base->accu)
(if (< size 4) '()
(append
(i386:accu+accu)
(if (= size 12) (i386:accu+base) '())
(i386:accu-shl 2))))))
((ident->base info) array)
(list (lambda (f g ta t d)
(case size
((1) (i386:byte-base-mem->accu))
((4) (i386:base-mem->accu))
(else (i386:accu+base)))))))))
(append (.text info)
;; immediate: (i386:value->accu (* size index))
;; * size cells: * length * 4 = * 12
(list (lambda (f g ta t d)
(append
(i386:accu->base)
(if (eq? size 1) '()
(append
(if (> size 4) (i386:accu+accu) '())
(if (> size 8) (i386:accu+base) '())
(i386:accu-shl 2))))))
((ident->base info) array)
(list (lambda (f g ta t d)
(append
(case size
((1) (i386:byte-base-mem->accu))
((4) (i386:base-mem->accu))
(else (i386:accu+base))))))))))
;; f.field
((d-sel (ident ,field) (p-expr (ident ,array)))

2
scaffold/t.c
View file

@ -294,7 +294,7 @@ struct_test ()
TYPE (1) = 1;
CAR (1) = 2;
CDR (1) = 3;
g_cells[0] = g_cells[1];
g_cells[0] = g_cells[0+1];
if (TYPE (0) != 1) return 1;
if (CAR (0) != 2) return 2;
if (CDR (0) != 3) return 3;

5
vector.c
View file

@ -87,12 +87,7 @@ list_to_vector (SCM x)
SCM p = VECTOR (v);
while (x != cell_nil)
{
#if __GNUC__
g_cells[p++] = g_cells[vector_entry (car (x))];
#else
SCM b = vector_entry (car (x));
g_cells[p++] = g_cells[b];
#endif
x = cdr (x);
}
return v;