Commit Graph

2138 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen 669c376273
core: eval-apply: Prepare for M2-Planet.
* src/eval-apply.c (apply_builtin): Split M2-Planet specific and CC
specifi part off to ..
* src/cc.c: New file, and
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* src/m2.c: New file.
* simple.make (MES_SOURCES, M2_SOURCES): Likewise.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen f76a12ae37
core: display: Prepare for pointer cells, M2-Planet.
Rewrite C-constructs not supported by M2-Planet

    if (foo)               -> if (foo != 0)
    if (!foo)              -> if (foo == 0)
    ;                      -> 0;
    // ...                 -> /* ... */

* src/display.c (display_helper): Use cell_ref.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen e4b24c27b1
core: gc: Prepare for pointer cells, M2-Planet.
* include/mes/mes.h (cell_zero): Declare.
* src/gc.c (gc_init): Initialize it.
(gc_init_news): Likewise.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen d363f1fee3
core: Remove cell_call_with_current_continuation special.
* include/mes/symbols.h (cell_call_with_current_continuation): Remove.
* src/eval-apply.c (eval_apply): Update to use
cell_symbol_call_with_current_continuation.
* src/symbol.c (init_symbols_): Remove inititialization.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen 84dad8ec52
core: Remove cell_begin special.
* include/mes/symbols.h (cell_begin): Remove.
* src/eval-apply.c (eval_apply): Update to use cell_symbol_begin.
* src/symbol.c (init_symbols_): Remove initialization.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen 43a8fa8cb1
core: Remove unused symbols.
* include/mes/symbols.h (cell_symbol_dot, cell_symbol_read_input_file,
cell_symbol_write, cell_symbol_display): Remove
* src/symbol.c (init_symbols_): Remove initializations.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen ad5b1f5932
core: builtins: MES_MINI.
* include/mes/mes.h (g_mini): New global.
* src/mes.c (init): Initialize it with environment variable MES_MINI.
* src/builtins.c (mes_builtins): Register a minimal set of builtins
when g_mini.
2022-05-01 22:58:39 +02:00
Jan (janneke) Nieuwenhuizen 885e7d3948
boot: Add gc test.
* scaffold/boot/gc.test: New file.
* build-aux/check-boot.sh (TESTS): Add it.
* include/mes/symbols.h (cell_symbol_program): New symbol.
* src/symbol.c (init_symbols_): Initialize it.
* src/mes.c (main): Add it to environment.
2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen 335c00147e
test/gc: Add gc inspection test.
* src/test/gc.c (main): New unit test.
* simple.make (test-gcc, test-m2): New target to build it.
* build-aux/pointer.sh: Add it.
2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen 41ce6dcce8
core: make_struct: Avoid creating garbage.
* src/struct.c (make_struct): Use STRUCT TYPE PRINTER FIELD0 ... FIELDN.
2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen e898234863
core: make-vector: Move to core.
* src/vector.c (make_vector_): Rename from make_vector__.  Add
parameter.  Fix double allocation.
(make_vector): Rename from make_vector_.  Use arity n.  Update users.
2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen a626ae9a05
kaem.run 2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen 764f4fd170
mescc: Mes C Library: Add M2-Planet support.
Mes can now be built with M2-Planet by running

    kaem --verbose --strict

* include/linux/x86/syscall.h (SYS_getcwd, SYS_dup, SYS_dup2,
SYS_unlilnk, SYS_gettimeofday, SYS_clock_gettime, SYS_time): Move to
libc section.  Add M2-Planet constants.
* include/m2/lib.h (struct timezone, struct timespec): struct timeval):
Define.  Add M2-Planet flavor prototypes for mes libc.
* include/mes/m2.h: Remove macros.
* include/mes/mes.h (g_start_time, __gettimeofday_time,
__get_internal_run_time_ts): Declare.
* src/mes.c (init): Initialize them.
* src/posix.c: Use them.
* lib/linux/_getcwd.c: Support M2-Planet.
* lib/linux/access.c: Likewise.
* lib/linux/chmod.c: Likewise.
* lib/linux/clock_gettime.c: Likewise.
* lib/linux/dup.c: Likewise.
* lib/linux/dup2.c: Likewise.
* lib/linux/gettimeofday.c: Likewise.
* lib/linux/read.c: Likewise.
* lib/linux/unlink.c: Likewise.
* lib/mes/fdgetc.c: Likewise.
* lib/mes/fdputc.c: Likewise.
* lib/posix/getenv.c: Likewise.
* lib/posix/setenv.c: Likewise.
* lib/stdlib/realloc.c: Likewise.
* lib/string/memcmp.c: Likewise.
* lib/string/memcpy.c: Likewise.
* lib/m2/abtol.c: New file.
* lib/m2/chmod.c: New file.
* lib/m2/clock_gettime.c: New file.
* lib/m2/execv.c: New file.
* lib/m2/execve.c: New file.
* lib/m2/exit.c: New file.
* lib/m2/getcwd.c: New file.
* lib/m2/ioctl.c: New file.
* lib/m2/isatty.c: New file.
* lib/m2/ntoab.c: New file.
* lib/m2/strncmp.c: New file.
* lib/m2/time.c: New file.
* lib/m2/waitpid.c: New file.
* simple.make: Use them.  Remove macro preprocessing for M2-Planet.
* kaem.run: New file.
2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen 671ba4b21a
core: posix: Prepare for M2-Planet.
* src/posix.c (access_p): Prepare for M2-Planet.
2022-05-01 22:58:38 +02:00
Jan (janneke) Nieuwenhuizen 3034323fd8
mescc: Mes C Library: Add waitpid for M2-Planet.
* lib/m2/waitpid.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen 893d866d55
mescc: Mes C Library: Add time for M2-Planet.
* lib/m2/time.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen 7ded6103fc
mescc: Mes C Library: Add ntoab for M2-Planet.
* lib/m2/ntoab.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen 3a6e0dd9b0
mescc: Mes C Library: Add isatty for M2-Planet.
* lib/m2/isatty.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen 928c691145
mescc: Mes C Library: Add ioctl for M2-Planet.
* lib/m2/ioctl.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen fa4a212917
mescc: Mes C Library: Add getcwd for M2-Planet.
* lib/m2/getcwd.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen 59d6623ee6
mescc: Mes C Library: Add exit for M2-Planet.
* lib/m2/exit.c: New file.
2022-05-01 22:58:37 +02:00
Jan (janneke) Nieuwenhuizen c8ff5817be
mescc: Mes C Library: Add execve for M2-Planet.
* lib/m2/execve.c: New file.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen a3fd2c6dac
mescc: Mes C Library: Add execv for M2-Planet.
* lib/m2/execv.c: New file.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen ec7e0b30ac
mescc: Mes C Library: Add clock_gettime for M2-Planet.
* lib/m2/clock_gettime.c: New file.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen 41f1548636
mescc: Mes C Library: Add chmod for M2-Planet.
* lib/m2/chmod.c: New file.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen 4f173b7ceb
mescc: Mes C Library: Add M2-Planet support.
Mes can now be built with M2-Planet by running

    kaem --verbose --strict

* include/linux/x86/syscall.h (SYS_getcwd, SYS_dup, SYS_dup2,
SYS_unlilnk, SYS_gettimeofday, SYS_clock_gettime, SYS_time): Move to
libc section.  Add M2-Planet constants.
* include/m2/lib.h (struct timezone, struct timespec): struct timeval):
Define.  Add M2-Planet flavor prototypes for mes libc.
* include/mes/m2.h: Remove macros.
* include/mes/mes.h (g_start_time, __gettimeofday_time,
__get_internal_run_time_ts): Declare.
* src/mes.c (init): Initialize them.
* src/posix.c: Use them.
* simple.make: Use them.  Remove macro preprocessing for M2-Planet.
* kaem.run: New file.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen d306a02c00
mescc: Mes C Library: Prepare for M2-Planet: realloc.
* lib/stdlib/realloc.c (realloc): Prepare for M2-Planet.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen f33bc20bc7
mescc: Mes C Library: Prepare for M2-Planet: fdputc.
* lib/mes/fdputc.c (fdputc): Prepare for M2-Planet.
2022-05-01 22:58:36 +02:00
Jan (janneke) Nieuwenhuizen 6e0ff69fc8
mescc: Mes C Library: Prepare for M2-Planet: unlink.
* lib/linux/unlink.c (unlink): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen e9eed6c996
mescc: Mes C Library: Prepare for M2-Planet: read.
* lib/linux/read.c (read): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen 11a2d8f60c
mescc: Mes C Library: Prepare for M2-Planet: gettimeofday.
* lib/linux/gettimeofday.c (gettimeofday): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen b1af20c691
mescc: Mes C Library: Prepare for M2-Planet: dup2.
* lib/linux/dup2.c (dup2): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen e1c5d7ef7a
mescc: Mes C Library: Prepare for M2-Planet: dup.
* lib/linux/dup.c (dup): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen 35db5aeefe
mescc: Mes C Library: Prepare for M2-Planet: clock_gettime.
* lib/linux/clock_gettime.c (clock_gettime): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen 640ba776e7
mescc: Mes C Library: Prepare for M2-Planet: chmod.
* lib/linux/chmod.c (chmod): Prepare for M2-Planet.
2022-05-01 22:58:35 +02:00
Jan (janneke) Nieuwenhuizen 8133ac3553
mescc: Mes C Library: Prepare for M2-Planet: access.
* lib/linux/access.c (access): Prepare for M2-Planet.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen 0a6df87427
mescc: Mes C Library: Prepare for M2-Planet: _getcwd.
* lib/linux/_getcwd.c (_getcwd): Prepare for M2-Planet.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen 08d198413a
core: Split-out stack.c
* src/lib.c (exit_, frame_printer, make_frame_type, make_frame,
make_stack_type, make_stack, stack_length, stack_ref_): Move to ..
* src/posix.c (exit_): Here and to ..
* src/core.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make (LIBMES_SOURCES): Likewise.
* build-aux/snarf.sh: Likewise.
* include/mes/builtins.h: Update.
* src/builtins.c (mes_builtins): Update.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen 05f1662c86
core: Split-out core.c.
* src/mes.c (assoc_string, car, cdr, list, null_p, eq_p, values, acons,
length__, length, error, append2, append_reverse, reverse_x_, assq,
assoc): Move to ...
* src/core.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make (MES_SOURCES): Likewise.
* build-aux/snarf.sh: Likewise.
* include/mes/builtins.h: Update.
* src/builtins.c (mes_builtins): Update.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen d20b96cd9c
mescc: Mes C Library: Bugfix __ungetc_clear.
* lib/m2/mes_open.c (mes_open): Remove __ungetc_init ();
* lib/m2/open.c (open): Likewise.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen 4f2d6302bd
kaem: scaffold/read.kaem.
* .gitignore: Update.
* include/linux/x86/syscall.h: Update for M2-Planet.
* lib/linux/brk.c (brk): Remove cast for M2-Planet.
* lib/linux/x86-mes-m2/syscall.c: New file.
* lib/m2/malloc.c: New file.
* lib/string/memset.c (memset): Update for M2-Planet.
* scaffold/read.c: Update for M2-Planet.
* scaffold/kaem.read: New file.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen 37ae5dc1fd
kaem: scaffold/argv.kaem.
* scaffold/argv.c (strcmp): Remove.
(main): Update.
* scaffold/argv.kaem: New file.
lib/x86-mes/x86.M1 (mov____%edi,%ebp, mov____%esp,%edi): New macro.
2022-05-01 22:58:34 +02:00
Jan (janneke) Nieuwenhuizen 92ab4b0f3a
kaem: scaffold/hello.kaem.
* include/m2/lib.h: New file.
* scaffold/hello.kaem: New file.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen aa8be292a8
kaem: scaffold/main.kaem.
* lib/linux/x86-mes-m2/crt1.c,
lib/linux/x86-mes-m2/crt1.M1,
lib/linux/x86-mes-m2/_exit.c,
lib/linux/x86-mes-m2/_write.c: New files.
* lib/m2/x86/x86_defs.M1: New file.  Import from stage0.
* lib/m2/x86/ELF-x86.hex2: New file.  Import from M2-Planet.
* scaffold/main.c: Update for M2-Planet.
* scaffold/main.kaem: New file.
* .gitignore: Update.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen 237333857f
core: Prepare for M2-Planet: if (foo).
Rewrite C-constructs not supported by M2-Planet

    if (foo)              -> if (foo != 0)

* src/posix.c: Rewrite C-constructs not supported by M2-Planet.
(current_input_port): Likewise.
* src/display.c (display_helper): : Likewise.
* src/eval-apply.c (expand_variable_): : Likewise.
(eval_apply): : Likewise.
* src/mes.c (open_boot): : Likewise.
* src/reader.c (reader_read_identifier_or_number): : Likewise.
* src/symbols.c (init_symbol): : Likewise.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen 05417d7659
core: Outline hashq_get_handle, hash_set_x_.
* src/hash.c (hashq_ref): Use hashq_get_handle.
(hashq_set_x_): Enable.
(hash_set_x): Use it.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen b5d5e6bc94
core: Prepare for M2-Planet: continue.
Rewrite C-constructs not supported by M2-Planet

    continue              -> goto LABEL

* src/eval-apply.c (eval_apply): Add label: begin_expand_while.  Use it
instead of continue.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen 497b37dd42
core: Prepare for M2-Planet: VALUE/TYPE indirections.
Rewrite C-constructs not supported by M2-Planet

    VALUE (CAR (foo))           -> SCM a = CAR (foo); VALUE (a)
    TYPE (CAR (foo))            -> SCM t = CAR (foo); TYPE (a)

* src/builtins.c (builtin_function): Use VALUE indirections.
(builtin_printer): Likewise.
* src/eval-apply.c (apply_builtin): Likewise.
(get_macro): Likewise.
(expand_variable_): Likewise.
(eval_apply): Likewise.
* src/hash.c (hashq_get_handle): Likewise.
(hashq_ref): Likewise.
(hash_ref): Likewise.
(hash_set_x): Likewise.
(hash_table_printer): Likewise.
* src/math.c (greater_p): Likewise.
(less_p): Likewise.
(is_p): Likewise.
(minus): Likewise.
(plus): Likewise.
(divide): Likewise.
(multiply): Likewise.
(logand): Likewise.
(logior): Likewise.
(logxor): Likewise.
* src/posix.c (current_input_port): Likewise.
(set_current_output_port): Likewise.
* src/reader.c (reader_read_list): Likewise.
(reader_read_character): Likewise.
(reader_read_string): Likewise.
* src/string.c (list_to_cstring): Likewise.
(read_string): Likewise.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen 201aef922a
core: Prepare for M2-Planet: M2_CELL_SIZE.
* src/gc.c (M2_CELL_SIZE): Hack for missing pointer arithmetic in
M2-Planet.
(gc_init, alloc, make_cell, gc_up_arena, gc_copy, gc_loop, gc_): Use it.
2022-05-01 22:58:33 +02:00
Jan (janneke) Nieuwenhuizen 858793a953
core: Use unique assert_msg.
* src/mes.c (error): Use unique assert_msg.
2022-05-01 22:58:32 +02:00