Commit Graph

2170 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen f7c2b70c82
squash! SCM / read.m2 2021-01-01 15:54:29 +01:00
Jan (janneke) Nieuwenhuizen a77903a113
Revert "Mes C Library: m2/getcwd.c: Remove specialization."
This reverts commit 37f44ce945.
2021-01-01 15:54:13 +01:00
Jan (janneke) Nieuwenhuizen b68abb20ab
squash! core: Prepare for M2-Planet: mes.c. 2021-01-01 15:49:14 +01:00
Jan (janneke) Nieuwenhuizen b6e5bec406
core: Move __getcwd_buf to Mes C Library.
* include/mes/mes.h (__getcwd_buf): Move to..
* lib/posix/getcwd.c (__getcwd_buf): ...here.
(getcwd): Refactor.
* src/posix.c (getcwd_): Do not use __getcwd_buf.
2021-01-01 15:46:59 +01:00
Jan (janneke) Nieuwenhuizen 7e1e54f47b
DRAFT: doc. 2021-01-01 11:58:36 +01:00
Jan (janneke) Nieuwenhuizen 99a48657c6
bootstrap: Support building with M2-Planet 1.4.
* lib/m2/x86/x86_defs.M1 (NOP): New define.
2021-01-01 11:57:39 +01:00
Jan (janneke) Nieuwenhuizen 93b094f706
DRAFT mescc: Only use signed division when numerator is signed.
XXX TODO: We are getting stray nondeterministic floating point
exceptions when compiling mes using mescc with an m2-planet-compiled
mes: recompilation often succeeds.

I am suspecting using signed division: CLTD / IDIV is the problem,
which were enabled here

    fa4147a284
    mescc: Use signed division for x86, x86_64 when appropriate.

before, we never used signed division.  This patch fixed

    lib/tests/scaffold/36-compare-arithmetic.c
    lib/tests/scaffold/36-compare-arithmetic-negative.c

As a workaround, I have been avoiding using signed division, however,
signed division should work just fine.

Currently, sign-extension (CLTD vs XOR EDX) and signed division (IDIV vs
DIV) selected by setting "signed?".  See, module/mescc/x86/as.scm.
Possibly we need a signed? based on numerator and denominator, and
add a extend-sign? based on the signedness of the numerator?

* module/mescc/compile.scm (expr->register): Base "signed?" strictly on
signedness of numerator.
2021-01-01 11:02:01 +01:00
Jan (janneke) Nieuwenhuizen 5f041b2474
mescc: Use unsigned type for sizeof expression.
* module/mescc/compile.scm (ast->type): Use unsigned type for sizeof
expression.
2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen 3607e8788e
mescc: Respect integer literal type suffixes.
* module/mescc/compile.scm (ast->type): Respect ULL, UL, U, LL, L suffix
on integer literals.
2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen 557c1d558a
core: Use unsigned constants.
* src/gc.c (FRAME_SIZE, M2_CELL_SIZE): Declare unsigned.
(gc_init): Use unsigned suffixes for divisions.
* src/posix.c (TIME_UNITS_PER_SECOND): Declare unsigned.
(UL1000000000): New constant.
(seconds_and_nanoseconds_to_long): Use it.
* src/gc.c (U10, U100): New constants.
(gc_init): Use them.
2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen 4fd5a897a3
DRAFT doc: Update. 2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen b910225cc0
core: Use size_t instead of long for gc sizes.
* include/mes/mes.h (ARENA_SIZE, MAX_ARENA_SIZE, STACK_SIZE, JAM_SIZE,
GC_SAFETY, MAX_STRING): Use size_t instead of long.
2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen 3f8f3e5706
core: Avoid Floating point exception dividing negative numbers.
* src/posix.c (seconds_and_nanoseconds_to_long): Use unsigned division.
2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen 9d2e0f57c5
core: Avoid Floating point exception dividing negative numbers.
This fixes

    kaem --verbose --strict
    bin/mes-m2 -c '(display (modulo -1 -1))'

* src/math.c (modulo): Use unsigned division.
2021-01-01 11:02:00 +01:00
Jan (janneke) Nieuwenhuizen bc259867c4
bootstrap: Use ./pre-inst-env mescc default.
* configure.sh: When CC is mescc, M2-Planet or unset, use
"./pre-inst-env mescc" as default.
2021-01-01 11:01:59 +01:00
Jan (janneke) Nieuwenhuizen 08c9b519cf
tests: string-join: Be noisy.
* scaffold/boot/50-string-join.scm ("string-join\n"): Avoid exit 0
without output.
2021-01-01 09:56:05 +01:00
Jan (janneke) Nieuwenhuizen a8028c9da2
mes: simple-format: Use core display.
* mes/module/mes/simple-format.mes: Do not import (mes display).
2021-01-01 09:56:05 +01:00
Jan (janneke) Nieuwenhuizen d24ac33e5f
mes: Resurrect backtraces.
* mes/module/mes/catch.mes (%eh): Resurrect backtraces.
(display-frame): New function.
(display-backtrace): Use it.
2021-01-01 09:56:04 +01:00
Jan (janneke) Nieuwenhuizen 8dd691c6dd
mes: Remove PEG.
PEG is not used and mostly broken.

* mes/module/mes/peg.mes,
mes/module/mes/peg/cache.scm,
mes/module/mes/peg/codegen.scm,
mes/module/mes/peg/simplify-tree.scm,
mes/module/mes/peg/string-peg.scm,
mes/module/mes/peg/using-parsers.scm,
tests/peg.test: Remove.
* AUTHORS: Remove mention.
2021-01-01 09:56:04 +01:00
Jan (janneke) Nieuwenhuizen f65fb67954
.dir-locals: Add test macro indentation.
* .dir-locals.el (scheme-mode): Add indentation for pass-if,
pass-if-not, pass-if-eq, pass-if-equal, expect-fail, pass-if-timeout.
2021-01-01 09:56:04 +01:00
Jan (janneke) Nieuwenhuizen 21c0b3e99a
mescc: Use (format (current-error-port) ...) instead of stderr.
* module/mescc/M1.scm: Use (format (current-error-port) ...) instead of
stderr.
* module/mescc/compile.scm: Likewise.
* module/mescc/mescc.scm: Likewise.
* module/mescc/preprocess.scm: Likewise.
2021-01-01 09:56:04 +01:00
Jan (janneke) Nieuwenhuizen 7b9d8732ee
core: Add gc-stats.
* include/mes/mes.h (gc_start_time, gc_end_time, gc_time): New
variables.
* src/mes.c (init): Initialize them.
* src/gc.c: Use them.
* src/gc.c (gc_stats): New function.
* include/mes/builtins.h: Declare it.
* src/builtins.c (mes_builtins): Register it.
* tests/gc.test: Use it.
2021-01-01 09:56:04 +01:00
Jan (janneke) Nieuwenhuizen 92ac8a73d2
core: Avoid Floating point exception dividing negative numbers.
This fixes

    kaem --verbose --strict
    bin/mes-m2 -c '(display (/ -1 1))'

* src/math.c (divide): Use signed division.
2021-01-01 09:30:14 +01:00
Jan (janneke) Nieuwenhuizen d0a5e4fcad
Mes C Library: m2/execve.c: Remove specialization.
* lib/linux/execve.c (execve): Cater for M2-Planet.
* lib/m2/execve.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
2020-12-31 14:00:45 +01:00
Jan (janneke) Nieuwenhuizen 37f44ce945
Mes C Library: m2/getcwd.c: Remove specialization.
* lib/posix/getcwd.c (getcwd): Cater for M2-Planet.
* lib/m2/getcwd.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen 15859a4def
Mes C Library: m2/ioctl.c: Remove specialization.
* lib/stub/ioctl.c (ioctl3): Move to...
* lib/stub/ioctl3.c: ...new file.
* lib/m2/ioctl3.c: Move to...
* lib/linux/ioctl3.c: ...here.
* include/mes/lib.h (ioctl3): Declare it.
* lib/m2/isatty.c (isatty): Use it.
* build-aux/configure-lib.sh (libc_SOURCES): Include it; move
lib/linux/ioctl.c to ...
(libc_gnu_SOURCES): ... here.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES): Likewise.
* simple.sh (compiler): Likewise.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen b32c20185d
Mes C Library: m2/waitpid.c: Remove specialization.
* lib/linux/waitpid.c: Cater for M2-Planet.
* lib/m2/waitpid.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES, M2_TODO): Likewise.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen 7f10001be0
Mes C Library: m2/ntoab.c: Remove specialization.
* lib/mes/ntoab.c (__mesabi_uldiv)[__M2_PLANET__ || !(__MESC__ &&
__arm__)]:  New function.
* lib/mes/ntoab.c (ntoab): Use it to cater for M2-Planet.
* lib/m2/ntoab.c: Remove.
* kaem.run: Update accordingly.
* simple.make (M2_SOURCES, (M2_TODO): Likewise.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen a945c30078
build: Resurrect simple.sh.
* simple.sh: Do not attempt to build multiple C files with mescc.
Update for new and split C files.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen 304a1e0ca9
guix: m2-planet: Update to 1.7.0.
* guix/git/mes.scm (m2-planet)[source]: Update to 1.7.0.
[arguments]: Add CC to make-flags.  Update sha256sum patch.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen 37565a5eaf
guix: mescc-tools: Update to 1.1.0.
* guix/git/mes.scm (mescc-tools)[source]: Update to 1.1.0.
[arguments]: Update sha256sum patch.
2020-12-31 14:00:44 +01:00
Jan (janneke) Nieuwenhuizen a44d81e560
core: Prepare for M2-Planet 1.7.0.
* src/eval-apply.c (expand_variable_, apply_builtin): Declare variables
at toplevel.
* src/gc.c (gc_cellcpy, gc_loop, gc_dump_arena): Likewise.
* src/hash.c (hash_table_printer): Likewise.
* src/lib.c (equal2_p): Likewise.
* src/math.c (greater_p, less_p, is_p, minus, plus, divide, multiply,
logand, logior, logxor): Likewise.
* src/posix.c (current_input_port, execl_): Likewise.
* src/reader.c (reader_read_string): Likewise.
* src/stack.c (make_stack): Likewise.
* src/string.c (list_to_cstring, bytes_to_list, string_append):
Likewise.
* src/struct.c (make_struct): Likewise.
* src/vector.c (vector_to_list): Likewise.
2020-12-31 14:00:43 +01:00
Jan (janneke) Nieuwenhuizen e6a5805968
mescc: Mes C Library: Prepare for M2-Planet 1.7.0.
* lib/m2/ntoab.c (ntoab): Declare variables at toplevel.
* lib/mes/abtol.c (abtol): Likewise.
* lib/posix/getenv.c (getenv): Likewise.
* lib/posix/setenv.c (setenv): Likewise.
2020-12-31 14:00:43 +01:00
Jan (janneke) Nieuwenhuizen 9ac91d7980
mescc: Mes C Library: isatty: Use fixed array size for M2-Planet.
* lib/m2/isatty.c (struct ktermios)[c_cc]: Hardcode to size 19.
2020-12-31 14:00:43 +01:00
Jan (janneke) Nieuwenhuizen e3b8757400
mescc: Mes C Library: Update M2-Planet macros.
* lib/m2/x86/x86_defs.M1: Update from M2-Planet 1.7.0.
2020-12-31 14:00:43 +01:00
Jan (janneke) Nieuwenhuizen c58576748d
mes: compatibility: Move (mes pmatch) to (system base pmatch).
* mes/module/system/base/pmatch.scm: Move from mes/pmatch.scm.  Update
users.
2020-12-31 14:00:43 +01:00
Jan (janneke) Nieuwenhuizen ac6b3ba96f
mes: compatibility: Make base.mes pure guile.
* mes/module/mes/type-0.mes (procedure?): New function.  Rewrite
without `cond' from
* mes/module/mes/base.mes (procedure?): here; Remove.
2020-12-31 14:00:43 +01:00
Jan (janneke) Nieuwenhuizen 4bf946e27a
build: Cater for M2-Planet.
* configure: Drop MES_SEED, support M2-Planet.
* kaem.run: Also build bin/mes.
* build-aux/bootstrap.sh.in: Run kaem bootstrap.
* build-aux/build.sh.in: Run kaem bootstrap.  Build bin/mes.  Update
scripts and users.
* build-aux/install.sh.in: Install all built bin/mes-* flavours.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen 892f8f8655
guix: Update M2-Planet to 1fc2aeab483208bd2ba117b21df3894c182470ec.
* guix/git/mes.scm (m2-planet): Update to 1fc2aeab483208bd2ba117b21df3894c182470ec.
* lib/m2/x86/x86_defs.M1: Update from M2-Planet.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen 966f251f35
guix: Add m2-planet.
* guix/git/mes.scm (m2-planet): New variable.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen bcb2cc9dc6
core: Use casting functions.
Silence all casting errors by using casting functions.

* src/cc.c (cast_charp_to_scmp, cast_charp_to_scmpp,
cast_voidp_to_charp, cast_scmp_to_long, cast_scmp_to_charp): New function.
* src/m2.c (cast_charp_to_scmp, cast_charp_to_scmpp,
cast_voidp_to_charp, cast_scmp_to_long, cast_scmp_to_charp): New function.
* include/mes/mes.h: Declare them.
(struct scm): Add car_value, cdr_value, function.
(g_continuations): Change to long.
* src/mes.c: Silence all casting errors by using casting functions.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen 19ceda6e20
mescc: Mes C Library: Use casting functions.
Silence all casting errors by using casting functions.

* lib/mes/cast.c: New file.
* build-aux/configure-lib.sh (libmes_SOURCES): Add it.
* lib/m2/cast.c: New file.
* kaem.run: Add it.
* simple.make: Add them both.
* include/mes/lib.h: Add cast prototypes.
* include/m2/lib.h: Likewise.
* lib/linux/_getcwd.c (_getcwd): Use them.
* lib/linux/access.c (access): Likewise.
* lib/linux/brk.c (brk): Likewise.
* lib/linux/chmod.c (chmod): Likewise.
* lib/linux/clock_gettime.c (clock_gettime): Likewise.
* lib/linux/gettimeofday.c (gettimeofday): Likewise.
* lib/linux/unlink.c (unlink): Likewise.
* lib/mes/fdputc.c (fdputc): Likewise.
* lib/stdio/putchar.c (putchar): Likewise.
* lib/stdlib/malloc.c (malloc): Likewise.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen fd20ea1e0a
core: Switch to pointer cells.
Run

   build-aux/pointer.sh

* include/mes/macros.h: Remove.
* src/*.c: Update.
* include/mes/*.h: Update.
* simple.make: Update.
* kaem.run: Update.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen 71f0a68819
build: Update snarfer.
* build-aux/mes-snarf.scm (symbol->header): Update for pointer cells.
(snarf-symbols): Likewise.
(snarf-functions): Likewise.
2020-12-31 14:00:42 +01:00
Jan (janneke) Nieuwenhuizen 48fcb82d1a
core: Drop support for number based cells.
This removes the POINTER_CELLS define and all its references.

* simple.make (CFLAGS): Remove -D POINTER_CELLS.
* include/mes/mes.h: Remove #define POINTER_CELLS.
* include/mes/cc.h: Remove !POINTER_CELLS branches.
* include/mes/macros.h: Likewise.
* src/gc.c: Likewise.
* src/symbol.c: Likewise.
* src/test/gc.c: Likewise.
2020-12-31 14:00:41 +01:00
Jan (janneke) Nieuwenhuizen 15dedde333
core: gc: Pointer cells: Drop cells->news->cells flipping.
* src/gc.c (gc_init): Undo doubling of initial memory.
(gc_init_news)[!GC_NOFLIP]: Remove.
(gc_)[!GC_NOFLIP]: Remove symbol relocation.
(gc)[!GC_NOFLIP]: Remove second gc.
2020-12-31 14:00:41 +01:00
Jan (janneke) Nieuwenhuizen 85a7f71474
core: gc: Abort upon broken heart failure.
* src/gc.c (gc_cellcpy, gc_loop): Abort upon broken heart failure.
2020-12-31 14:00:41 +01:00
Jan (janneke) Nieuwenhuizen b040d07828
core: gc: Enable memory dump debugging.
* src/gc.c (gc): If MES_DUMP is set, dump arena.  [POINTER_CELLS &&
!GC_NOFLIP]: Run gc_ twice to enable comparing memory dumps.
2020-12-31 14:00:41 +01:00
Jan (janneke) Nieuwenhuizen 7f8ca5d69e
core: gc: Add gc_dump_arena.
* src/gc.c (dumpc, dumps, gc_dump_register, gc_dump_state,
gc_dump_stack, gc_dump_arena): New function.
2020-12-31 14:00:41 +01:00
Jan (janneke) Nieuwenhuizen 4c86ceddca
core: Pointer cells: Allow smaller memory footprint using cellcpy.
* src/gc.c (gc_init)[GC_NOFLIP]: Do not use double sized arena.
(gc_cellcpy): New function.
* src/gc.c (gc_flip): Use it, do not flip.
(gc_init_news)[GC_NOFLIP]: Update.
2020-12-31 14:00:41 +01:00