7a8a2fc517
* module/mescc/as.scm: Support abstracted assembly. * module/mescc/i386/as.scm: Rewrite. * module/mescc/x86_64/as.scm: Implement. * module/mescc/compile.scm: Refactor to abstracted assembly. * module/mescc/M1.scm: Update for partial 64 bit support. * module/mescc/bytevectors.scm (bytevector-u64-native-set!): New procedure. * module/mescc/i386/info.scm (i386:type-alist): Use 4 byte type length also for faking double, long long, long double. * module/mescc/info.scm:modified: * module/mescc/x86_64/info.scm (x86_64:registers): New variable. * lib/x86-mes/x86.M1: Update for new register scheme. * lib/x86_64-mes/x86_64.M1: Implement. * lib/x86-mes/setjmp.c: Implement. * lib/x86_64-mes-gcc/setjmp.c: Implement. * build-aux/build-cc.sh: Update for x86_64. * build-aux/build-cc32.sh: Likewise. * build-aux/build-mes.sh: Likewise. * build-aux/build-x86_64-mes.sh: Likewise. * build-aux/check-mescc.sh: Likewise. * build-aux/test64.sh: Likewise. * include/libmes.h: Likewise. * include/setjmp.h: Likewise. * include/signal.h: Likewise. * include/stdarg.h: Likewise. * include/sys/stat.h: Likewise. * include/sys/types.h: Likewise. * include/sys/wait.h: Likewise. * include/unistd.h: Likewise. * lib/libc+gnu.c: Likewise. * lib/libc+tcc.c: Likewise. * lib/linux/gnu.c: Likewise. * lib/linux/libc-mini.c: Likewise. * lib/linux/libc.c: Likewise. * lib/linux/tcc.c: Likewise. * lib/linux/x86_64-mes-gcc/mes.c: Likewise. * lib/linux/x86_64-mes/crt1.c: Likewise. * lib/mes/abtol.c: Likewise. * lib/posix/mktemp.c: Likewise. * lib/posix/wait.c: Likewise. * lib/stdio/fopen.c: Likewise. * lib/stdio/fputc.c: Likewise. * lib/stdio/fseek.c: Likewise. * lib/stdio/printf.c: Likewise. * lib/stdio/sprintf.c: Likewise. * lib/stdio/vfprintf.c: Likewise. * lib/stdio/vsprintf.c: Likewise. * lib/stdio/vsscanf.c: Likewise. * lib/stdlib/qsort.c: Likewise. * lib/x86-mes-gcc/setjmp.c: Likewise. * scaffold/tests/11-if-1.c: Likewise. * scaffold/tests/15-if-!f.c: Likewise. * scaffold/tests/16-if-t.c: Likewise. * scaffold/tests/21-char[].c: Likewise. * scaffold/tests/23-pointer.c: Likewise. * scaffold/tests/32-compare.c: Likewise. * scaffold/tests/33-and-or.c: Likewise. * scaffold/tests/34-pre-post.c: Likewise. * scaffold/tests/35-compare-char.c: Likewise. * scaffold/tests/36-compare-arithmetic.c: Likewise. * scaffold/tests/37-compare-assign.c: Likewise. * scaffold/tests/38-compare-call.c: Likewise. * scaffold/tests/40-if-else.c: Likewise. * scaffold/tests/41-?.c: Likewise. * scaffold/tests/42-goto-label.c: Likewise. * scaffold/tests/43-for-do-while.c: Likewise. * scaffold/tests/44-switch.c: Likewise. * scaffold/tests/45-void-call.c: Likewise. * scaffold/tests/46-function-static.c: Likewise. * scaffold/tests/51-strcmp.c: Likewise. * scaffold/tests/51-strncmp.c: Likewise. * scaffold/tests/53-strcpy.c: Likewise. * scaffold/tests/54-argv.c: Likewise. * scaffold/tests/60-math.c: Likewise. * scaffold/tests/61-array.c: Likewise. * scaffold/tests/63-struct-cell.c: Likewise. * scaffold/tests/64-make-cell.c: Likewise. * scaffold/tests/65-read.c: Likewise. * scaffold/tests/70-printf.c: Likewise. * scaffold/tests/71-struct-array.c: Likewise. * scaffold/tests/72-typedef-struct-def.c: Likewise. * scaffold/tests/74-multi-line-string.c: Likewise. * scaffold/tests/76-pointer-arithmetic.c: Likewise. * scaffold/tests/79-int-array.c: Likewise. * scaffold/tests/7a-struct-char-array.c: Likewise. * scaffold/tests/7b-struct-int-array.c: Likewise. * scaffold/tests/7i-struct-struct.c: Likewise. * scaffold/tests/7k-for-each-elem.c: Likewise. * scaffold/tests/7l-struct-any-size-array.c: Likewise. * scaffold/tests/7o-struct-pre-post.c: Likewise. * scaffold/tests/7q-bit-field.c: Likewise. * scaffold/tests/7s-struct-short.c: Likewise. * scaffold/tests/80-setjmp.c: Likewise. * scaffold/tests/81-qsort.c: Likewise. * scaffold/tests/85-sizeof.c: Likewise. * scaffold/tests/87-sscanf.c: Likewise. * scaffold/tests/90-strpbrk.c: Likewise. * scaffold/tests/91-fseek.c: Likewise. * scaffold/tests/95-signal.c: Likewise. * scaffold/tests/97-fopen.c: Likewise. * scaffold/tests/99-readdir.c: Likewise. * scaffold/tests/t.c: Likewise. * lib/linux/x86_64-mes/mes.c: New file. * lib/linux/x86_64-mes/mini.c: New file. * lib/x86_64-mes/setjmp.c: New file. * scaffold/tests/06-!call-1.c: New file. * scaffold/tests/06-call-2.c: New file. * scaffold/tests/06-call-variable.c: New file. * scaffold/tests/08-assign-global.c: New file. * scaffold/tests/08-assign-negative.c: New file. * scaffold/tests/17-compare-and-or.c: New file. * scaffold/tests/17-compare-and.c: New file. * scaffold/tests/17-compare-ge.c: New file. * scaffold/tests/17-compare-gt.c: New file. * scaffold/tests/17-compare-le.c: New file. * scaffold/tests/17-compare-lt.c: New file. * scaffold/tests/17-compare-or.c: New file. * scaffold/tests/17-compare-unsigned-ge.c: New file. * scaffold/tests/17-compare-unsigned-gt.c: New file. * scaffold/tests/17-compare-unsigned-le.c: New file. * scaffold/tests/17-compare-unsigned-lt.c: New file. * scaffold/tests/21-char[]-simple.c: New file. * scaffold/tests/23-global-pointer-init-null.c: New file. * scaffold/tests/23-global-pointer-init.c: New file. * scaffold/tests/23-global-pointer-pointer-ref.c: New file. * scaffold/tests/23-global-pointer-ref.c: New file. * scaffold/tests/23-pointer-sub.c: New file. * scaffold/tests/31-oputs.c: New file. * scaffold/tests/32-call-wrap.c: New file. * scaffold/tests/38-compare-call-2.c: New file. * scaffold/tests/38-compare-call-3.c: New file. * scaffold/tests/51-pointer-sub.c: New file. * scaffold/tests/54-argc.c: New file. * scaffold/tests/63-struct-array-assign.c: New file. * scaffold/tests/63-struct-array-compare.c: New file. * scaffold/tests/63-struct-array.c: New file. * scaffold/tests/63-struct-assign.c: New file. * scaffold/tests/63-struct-function.c: New file. * scaffold/tests/63-struct-local.c: New file. * scaffold/tests/63-struct-pointer.c: New file. * scaffold/tests/63-struct.c: New file. * scaffold/tests/70-printf-hello.c: New file. * scaffold/tests/70-printf-simple.c: New file. * scaffold/tests/70-stdarg.c: New file. * scaffold/tests/70-strchr.c: New file. * scaffold/tests/73-union-hello.c: New file. * scaffold/tests/76-pointer-arithmetic-pp.c: New file. * scaffold/tests/79-int-array-simple.c: New file. * scaffold/tests/7b-struct-int-array-hello.c: New file. * scaffold/tests/7b-struct-int-array-pointer.c: New file. * scaffold/tests/7i-struct-struct-simple.c: New file. * scaffold/tests/7k-for-each-elem-simple.c: New file. * scaffold/tests/7l-struct-any-size-array-simple.c: New file. * scaffold/tests/7o-struct-pre-post-simple.c: New file. * scaffold/tests/7q-bit-field-simple.c: New file. * scaffold/tests/90-strspn.c: New file. * scaffold/tests/06-call-string.c.: Rename from 31-eputs.c. * scaffold/tests/7t-function-destruct.c: Rename from 48-function-destruct.c. * scaffold/tests/48-global-static.c: Rename from 49-global-static.c. * scaffold/tests/55-char-array.c:renamed: Rename from 4a-char-array.c. * scaffold/tests/51-itoa.c:r Rename from 52-itoa.c. * include/signal.h:(struct sigaction):
205 lines
5.2 KiB
C
205 lines
5.2 KiB
C
/* -*-comment-start: "//";comment-end:""-*-
|
|
* GNU Mes --- Maxwell Equations of Software
|
|
* Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
|
*
|
|
* This file is part of GNU Mes.
|
|
*
|
|
* GNU 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.
|
|
*
|
|
* GNU 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 GNU Mes. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
int
|
|
vfprintf (FILE* f, char const* format, va_list ap)
|
|
{
|
|
int fd = (long)f;
|
|
char const *p = format;
|
|
int count = 0;
|
|
while (*p)
|
|
if (*p != '%')
|
|
{
|
|
count++;
|
|
fputc (*p++, fd);
|
|
}
|
|
else
|
|
{
|
|
p++;
|
|
char c = *p;
|
|
int left_p = 0;
|
|
int precision = -1;
|
|
int width = -1;
|
|
if (c == '-')
|
|
{
|
|
left_p = 1;
|
|
c = *++p;
|
|
}
|
|
char pad = ' ';
|
|
if (c == '0')
|
|
{
|
|
pad = c;
|
|
c = *p++;
|
|
}
|
|
if (c >= '0' && c <= '9')
|
|
{
|
|
width = abtol (&p, 10);
|
|
c = *p;
|
|
}
|
|
else if (c == '*')
|
|
{
|
|
width = va_arg (ap, int);
|
|
c = *++p;
|
|
}
|
|
if (c == '.')
|
|
{
|
|
c = *++p;
|
|
if (c >= '0' && c <= '9')
|
|
{
|
|
precision = abtol (&p, 10);
|
|
c = *p;
|
|
}
|
|
else if (c == '*')
|
|
{
|
|
precision = va_arg (ap, int);
|
|
c = *++p;
|
|
}
|
|
}
|
|
if (c == 'l')
|
|
c = *++p;
|
|
if (c == 'l')
|
|
{
|
|
eputs ("vfprintf: skipping second: l\n");
|
|
c = *++p;
|
|
}
|
|
switch (c)
|
|
{
|
|
case '%':
|
|
{
|
|
fputc (*p, fd);
|
|
count++;
|
|
break;
|
|
}
|
|
case 'c':
|
|
{
|
|
char _c;
|
|
_c = va_arg (ap, long);
|
|
fputc (_c, fd);
|
|
break;
|
|
}
|
|
case 'd':
|
|
case 'i':
|
|
case 'o':
|
|
case 'u':
|
|
case 'x':
|
|
case 'X':
|
|
{
|
|
long d = va_arg (ap, long);
|
|
int base = c == 'o' ? 8
|
|
: c == 'x' || c == 'X' ? 16
|
|
: 10;
|
|
char const *s = ntoab (d, base, c != 'u' && c != 'x' && c != 'X');
|
|
if (c == 'X')
|
|
strupr (s);
|
|
int length = strlen (s);
|
|
if (precision == -1)
|
|
precision = length;
|
|
if (!left_p)
|
|
{
|
|
while (width-- > precision)
|
|
{
|
|
fputc (pad, f);
|
|
count++;
|
|
}
|
|
while (precision > length)
|
|
{
|
|
fputc ('0', f);
|
|
precision--;
|
|
width--;
|
|
count++;
|
|
}
|
|
}
|
|
while (*s)
|
|
{
|
|
if (precision-- <= 0)
|
|
break;
|
|
width--;
|
|
fputc (*s++, f);
|
|
count++;
|
|
}
|
|
while (width > 0)
|
|
{
|
|
width--;
|
|
fputc (pad, f);
|
|
count++;
|
|
}
|
|
break;
|
|
}
|
|
case 's':
|
|
{
|
|
char *s = va_arg (ap, char *);
|
|
int length = strlen (s);
|
|
if (precision == -1)
|
|
precision = length;
|
|
if (!left_p)
|
|
{
|
|
while (width-- > precision)
|
|
{
|
|
fputc (pad, f);
|
|
count++;
|
|
}
|
|
while (precision > length)
|
|
{
|
|
fputc (' ', f);
|
|
precision--;
|
|
width--;
|
|
count++;
|
|
}
|
|
}
|
|
while (*s)
|
|
{
|
|
if (precision-- <= 0)
|
|
break;
|
|
width--;
|
|
fputc (*s++, f);
|
|
count++;
|
|
}
|
|
while (width > 0)
|
|
{
|
|
width--;
|
|
fputc (pad, f);
|
|
count++;
|
|
}
|
|
break;
|
|
}
|
|
case 'n':
|
|
{
|
|
int *n = va_arg (ap, int *);
|
|
*n = count;
|
|
break;
|
|
}
|
|
default:
|
|
{
|
|
eputs ("vfprintf: not supported: %:");
|
|
eputc (c);
|
|
eputs ("\n");
|
|
p++;
|
|
}
|
|
}
|
|
p++;
|
|
}
|
|
va_end (ap);
|
|
return 0;
|
|
}
|