cf9753a69a
core: Resurrect gcc-10 support.
...
* include/mes/mes.h (g_datadir, g_debug, g_buf, g_continuations,
g_symbols, g_symbol_max, g_mini, R0, R1, R2, R3, M0, g_macros, g_ports,
ARENA_SIZE, MAX_ARENA_SIZE, STACK_SIZE, JAM_SIZE, GC_SAFETY, MAX_STRING,
g_arena, cell_arena, cell_zero, g_free, g_symbol, g_stack_array,
g_cells, g_news, g_stack, gc_count, gc_start_time, gc_end_time, gc_time,
__execl_c_argv, __open_boot_buf, __open_boot_file_name, __setenv_buf,
__reader_read_char_buf, g_start_time, __gettimeofday_time,
__get_internal_run_time_ts): Declare extern.
* include/mes/symbols.h ( cell_nil, cell_f, cell_t, cell_dot,
cell_arrow, cell_undefined, cell_unspecified, cell_closure,
cell_circular, cell_vm_apply, cell_vm_apply2, cell_vm_begin,
cell_vm_begin_eval, cell_vm_begin_expand, cell_vm_begin_expand_eval,
cell_vm_begin_expand_macro, cell_vm_begin_expand_primitive_load,
cell_vm_begin_primitive_load, cell_vm_begin_read_input_file,
cell_vm_call_with_current_continuation2, cell_vm_call_with_values2,
cell_vm_eval, cell_vm_eval2, cell_vm_eval_check_func,
cell_vm_eval_define, cell_vm_eval_macro_expand_eval,
cell_vm_eval_macro_expand_expand, cell_vm_eval_pmatch_car,
cell_vm_eval_pmatch_cdr, cell_vm_eval_set_x, cell_vm_evlis,
cell_vm_evlis2, cell_vm_evlis3, cell_vm_if, cell_vm_if_expr,
cell_vm_macro_expand, cell_vm_macro_expand_car,
cell_vm_macro_expand_cdr, cell_vm_macro_expand_define,
cell_vm_macro_expand_define_macro, cell_vm_macro_expand_lambda,
cell_vm_macro_expand_set_x, cell_vm_return, cell_symbol_lambda,
cell_symbol_begin, cell_symbol_if, cell_symbol_quote,
cell_symbol_define, cell_symbol_define_macro, cell_symbol_quasiquote,
cell_symbol_unquote, cell_symbol_unquote_splicing, cell_symbol_syntax,
cell_symbol_quasisyntax, cell_symbol_unsyntax,
cell_symbol_unsyntax_splicing, cell_symbol_set_x, cell_symbol_sc_expand,
cell_symbol_macro_expand, cell_symbol_portable_macro_expand,
cell_symbol_sc_expander_alist, cell_symbol_call_with_values,
cell_symbol_call_with_current_continuation, cell_symbol_boot_module,
cell_symbol_current_module, cell_symbol_primitive_load, cell_symbol_car,
cell_symbol_cdr, cell_symbol_not_a_number, cell_symbol_not_a_pair,
cell_symbol_system_error, cell_symbol_throw,
cell_symbol_unbound_variable, cell_symbol_wrong_number_of_args,
cell_symbol_wrong_type_arg, cell_symbol_buckets, cell_symbol_builtin,
cell_symbol_frame, cell_symbol_hashq_table, cell_symbol_module,
cell_symbol_procedure, cell_symbol_record_type, cell_symbol_size,
cell_symbol_stack, cell_symbol_argv, cell_symbol_mes_datadir,
cell_symbol_mes_version, cell_symbol_internal_time_units_per_second,
cell_symbol_compiler, cell_symbol_arch, cell_symbol_pmatch_car,
cell_symbol_pmatch_cdr, cell_type_bytes, cell_type_char,
cell_type_closure, cell_type_continuation, cell_type_function,
cell_type_keyword, cell_type_macro, cell_type_number, cell_type_pair,
cell_type_port, cell_type_ref, cell_type_special, cell_type_string,
cell_type_struct, cell_type_symbol, cell_type_values,
cell_type_variable, cell_type_vector, cell_type_broken_heart,
cell_symbol_program, cell_symbol_test): Likewise.
* src/globals.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
2022-04-30 08:42:16 +02:00
7139e47b8e
guix: m2-planet: Update to 1.7.0-32-gaa3472b.
...
This adds support for skipping "extern".
* guix/git/mes.scm (m2-planet)[source]: Update to 1.7.0-32-gaa3472b.
2022-04-30 08:42:16 +02:00
f368451fe0
scaffold: Add local-static-array.c.
...
GCC gives
12:35:54 janneke@dundal:~/src/mes/wip-m2 [env]
$ gcc scaffold/local-static-array.c
12:36:01 janneke@dundal:~/src/mes/wip-m2 [env]
$ ./a.out
hello local static
hello local static
12:36:04 janneke@dundal:~/src/mes/wip-m2 [env]
M2-Planet gives
12:36:04 janneke@dundal:~/src/mes/wip-m2 [env]
$ kaem --verbose --strict --file scaffold/local-static-array.kaem
+> M2-Planet --debug --architecture x86 -f lib/mes/globals.c -f lib/linux/x86-mes-m2/mini.c -f lib/mes/mini-write.c -f lib/string/strlen.c -f lib/string/strcpy.c -f lib/mes/eputs.c -f scaffold/local-static-array.c -o scaffold/local-static-array.M1
scaffold/local-static-array.c:29:static is not a defined symbol
Subprocess error 256
ABORTING HARD
[1]12:36:07 janneke@dundal:~/src/mes/wip-m2 [env]
* scaffold/local-static-array.c: New file.
* scaffold/local-static-array.kaem: New file.
2022-04-30 08:42:16 +02:00
25419a3db3
scaffold: Add local-array.c.
...
GCC gives
12:32:06 janneke@dundal:~/src/mes/wip-m2 [env]
$ gcc scaffold/local-array.c
12:34:27 janneke@dundal:~/src/mes/wip-m2 [env]
$ ./a.out
hello local
12:34:31 janneke@dundal:~/src/mes/wip-m2 [env]
M2-Planet gives
12:34:31 janneke@dundal:~/src/mes/wip-m2 [env]
$ kaem --verbose --strict --file scaffold/local-array.kaem
+> M2-Planet --debug --architecture x86 -f lib/mes/globals.c -f lib/linux/x86-mes-m2/mini.c -f lib/mes/mini-write.c -f lib/string/strlen.c -f lib/string/strcpy.c -f lib/mes/eputs.c -f scaffold/local-array.c -o scaffold/local-array.M1
scaffold/local-array.c:29:ERROR in collect_local
Missing ;
Subprocess error 256
ABORTING HARD
[1]12:34:42 janneke@dundal:~/src/mes/wip-m2 [env]
* scaffold/local-array.c: New file.
* scaffold/local-array.kaem: New file.
2022-04-30 08:42:16 +02:00
e48b878931
scaffold: Add global-array.c.
...
GCC gives
12:30:45 janneke@dundal:~/src/mes/wip-m2 [env]
$ gcc scaffold/global-array.c
12:31:53 janneke@dundal:~/src/mes/wip-m2 [env]
$ ./a.out
hello global
12:31:54 janneke@dundal:~/src/mes/wip-m2 [env]
M2-Planet gives
12:31:54 janneke@dundal:~/src/mes/wip-m2 [env]
$ kaem --verbose --strict --file scaffold/global-array.kaem
+> M2-Planet --debug --architecture x86 -f lib/mes/globals.c -f lib/linux/x86-mes-m2/mini.c -f lib/mes/mini-write.c -f lib/string/strlen.c -f lib/string/strcpy.c -f lib/mes/eputs.c -f scaffold/global-array.c -o scaffold/global-array.M1
scaffold/global-array.c:20:Received [ in program
Subprocess error 256
ABORTING HARD
[1]12:32:06 janneke@dundal:~/src/mes/wip-m2 [env]
* scaffold/global-array.c: New file.
* scaffold/global-array.kaem: New file.
2022-04-30 08:42:16 +02:00
286a01a8f9
doc: Add test hints to `HACKING'.
...
* HACKING (TESTING): New section.
2022-04-30 08:42:16 +02:00
19979f1833
Revert "Mes C Library: m2/execve.c: Remove specialization."
...
This fixes
gcc-lib/libc+gnu.c: At top level:
gcc-lib/libc+gnu.c:2694:1: error: conflicting types for ‘execve’
execve (char const *file_name, char **argv, char **env)
^~~~~~
In file included from gcc-lib/libc+gnu.c:492:0:
include/unistd.h:66:5: note: previous declaration of ‘execve’ was here
int execve (char const *file, char *const argv[], char *const env[]);
^~~~~~
This reverts commit 828c27a073
2022-04-30 08:42:16 +02:00
6651c02179
bootstrap: Update M2-Planet x86 definitions from 1.7.0-31-g358b6cf.
...
* lib/m2/x86/x86_defs.M1: Update.
2022-04-30 08:42:16 +02:00
e394e8709d
guix: m2-planet: Update to 1.7.0-31-g358b6cf.
...
* guix/git/mes.scm (m2-planet)[source]: Update to 1.7.0-31-g358b6cf.
2022-04-30 08:42:16 +02:00
42bfa654eb
Revert "Mes C Library: m2/getcwd.c: Remove specialization."
...
This reverts commit 37f44ce945
2022-04-30 08:42:16 +02:00
68075eb630
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.
2022-04-30 08:42:16 +02:00
5200ebe9ce
bootstrap: Support building with M2-Planet 1.4.
...
* lib/m2/x86/x86_defs.M1 (NOP): New define.
2022-04-30 08:42:16 +02:00
7ae490b22d
mescc: Only use signed division when numerator is signed.
...
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.
2022-04-30 08:42:16 +02:00
6a82c55d37
mescc: Use unsigned type for sizeof expression.
...
* module/mescc/compile.scm (ast->type): Use unsigned type for sizeof
expression.
2022-04-30 08:42:16 +02:00
7943e06b82
mescc: Respect integer literal type suffixes.
...
* module/mescc/compile.scm (ast->type): Respect ULL, UL, U, LL, L suffix
on integer literals.
2022-04-30 08:42:16 +02:00
5b7164b57f
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.
2022-04-30 08:42:16 +02:00
4373de382a
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.
2022-04-30 08:42:16 +02:00
4188c67d65
core: Avoid Floating point exception dividing negative numbers.
...
* src/posix.c (seconds_and_nanoseconds_to_long): Use unsigned division.
2022-04-30 08:42:16 +02:00
38ce6e7570
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.
2022-04-30 08:42:16 +02:00
1cfbac8bd6
bootstrap: Use ./pre-inst-env mescc default.
...
* configure.sh: When CC is mescc, M2-Planet or unset, use
"./pre-inst-env mescc" as default.
2022-04-30 08:42:16 +02:00
6e2a17f676
tests: string-join: Be noisy.
...
* scaffold/boot/50-string-join.scm ("string-join\n"): Avoid exit 0
without output.
2022-04-30 08:42:16 +02:00
0b62cdf804
mes: simple-format: Use core display.
...
* mes/module/mes/simple-format.mes: Do not import (mes display).
2022-04-30 08:42:16 +02:00
a84edd1f17
mes: Resurrect backtraces.
...
* mes/module/mes/catch.mes (%eh): Resurrect backtraces.
(display-frame): New function.
(display-backtrace): Use it.
2022-04-30 08:42:16 +02:00
3ed01337e6
core: Add abort.
...
* lib/stub/__raise.c: New file.
* kaem.run: Use it.
* src/posix.c (__raise)[SYSTEM_LIBC]: New macro.
(abort_): New function: possibly use it.
* include/mes/builtins.h: Declare it.
* src/builtins.c (mes_builtins): Register it.
2022-04-30 08:42:16 +02:00
e33bd137a1
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.
2022-04-30 08:42:16 +02:00
36c76bcc82
.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.
2022-04-30 08:42:16 +02:00
7193dd1883
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.
2022-04-30 08:42:16 +02:00
a646915a67
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.
2022-04-30 08:42:16 +02:00
8fd472eef5
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.
2022-04-30 08:42:16 +02:00
d263c783a9
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.
2022-04-30 08:42:16 +02:00
f02e5b451c
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.
2022-04-30 08:42:16 +02:00
9bee85fac2
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.
2022-04-30 08:42:16 +02:00
19003a3194
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.
2022-04-30 08:42:16 +02:00
786db24271
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.
2022-04-30 08:42:16 +02:00
4276b86737
build: Resurrect simple.sh.
...
* simple.sh: Do not attempt to build multiple C files with mescc.
Update for new and split C files.
2022-04-30 08:42:16 +02:00
3114f3fa82
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.
2022-04-30 08:42:16 +02:00
0f5061cc04
guix: mescc-tools: Update to 1.1.0.
...
* guix/git/mes.scm (mescc-tools)[source]: Update to 1.1.0.
[arguments]: Update sha256sum patch.
2022-04-30 08:42:14 +02:00
805cf421b6
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.
2022-04-30 08:41:48 +02:00
d7f66880d1
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.
2022-04-30 08:41:48 +02:00
69f948c565
mescc: Mes C Library: isatty: Use fixed array size for M2-Planet.
...
* lib/m2/isatty.c (struct ktermios)[c_cc]: Hardcode to size 19.
2022-04-30 08:41:48 +02:00
6d98cca297
mescc: Mes C Library: Update M2-Planet macros.
...
* lib/m2/x86/x86_defs.M1: Update from M2-Planet 1.7.0.
2022-04-30 08:41:48 +02:00
a5b28f1592
mes: compatibility: Move (mes pmatch) to (system base pmatch).
...
* mes/module/system/base/pmatch.scm: Move from mes/pmatch.scm. Update
users.
2022-04-30 08:41:48 +02:00
13db32816d
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.
2022-04-30 08:41:48 +02:00
5ba81f305f
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.
2022-04-30 08:41:48 +02:00
560f98dfea
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.
2022-04-30 08:41:48 +02:00
91acfe23b2
guix: Add m2-planet.
...
* guix/git/mes.scm (m2-planet): New variable.
2022-04-30 08:41:48 +02:00
cc3230cb4e
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.
2022-04-30 08:41:48 +02:00
5b54da17f5
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/linux/malloc.c (malloc): Likewise.
2022-04-30 08:41:48 +02:00
14c1414559
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.
2022-04-30 08:41:48 +02:00
98f8c05522
build: Update snarfer.
...
* build-aux/mes-snarf.scm (symbol->header): Update for pointer cells.
(snarf-symbols): Likewise.
(snarf-functions): Likewise.
2022-04-30 08:41:48 +02:00
Jan (janneke) Nieuwenhuizen