Commit Graph

280 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen cd44059243
test/gc: vector.
* src/test/gc.c (test_vector): New function.
(main): Call it.
(print_arena): New function.
(test_gc): Call it.
2021-03-21 16:20:10 +01:00
Jan (janneke) Nieuwenhuizen f78b9d3153
test/gc: string.
* src/test/gc.c (test_string): New function.
(main): Call it.
2021-03-21 16:20:09 +01:00
Jan (janneke) Nieuwenhuizen ebd31366aa
test/gc: list.
* src/test/gc.c (test_list): New function.
(main): Call it.
2021-03-21 16:20:09 +01:00
Jan (janneke) Nieuwenhuizen 6d8e8ad590
test/gc: cons. 2021-03-21 16:20:09 +01:00
Jan (janneke) Nieuwenhuizen 985696f1d1
test/gc: number.
* src/test/gc.c (test_number): New function.
(main): Call it.
2021-03-21 16:20:09 +01:00
Jan (janneke) Nieuwenhuizen 905b5739ae
test/gc: empty.
* src/test/gc.c (test_empty): New function.
2021-03-21 16:20:09 +01:00
Jan (janneke) Nieuwenhuizen 9c5b6958f0
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.
2021-03-21 16:20:09 +01:00
Jan (janneke) Nieuwenhuizen d8a535a7ec
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen 013e4bed32
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen 6d78c8b416
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen c28b90b316
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen 1b7b618843
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen ba88bb11cb
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen 8afca354b2
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.
2021-03-21 16:20:08 +01:00
Jan (janneke) Nieuwenhuizen 50c2e18433
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.
2021-03-21 16:20:07 +01:00
Jan (janneke) Nieuwenhuizen 9a4ad9dd92
core: make_struct: Avoid creating garbage.
* src/struct.c (make_struct): Use STRUCT TYPE PRINTER FIELD0 ... FIELDN.
2021-03-21 16:20:07 +01:00
Jan (janneke) Nieuwenhuizen 19ad2a5c1e
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.
2021-03-21 16:20:07 +01:00
Jan (janneke) Nieuwenhuizen 890fa8ed39
core: posix: Prepare for M2-Planet.
* src/posix.c (access_p): Prepare for M2-Planet.
2021-03-21 16:20:07 +01:00
Jan (janneke) Nieuwenhuizen aa2ba816e3
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.
2021-03-21 16:20:05 +01:00
Jan (janneke) Nieuwenhuizen 754f94ed4a
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.
2021-03-21 16:20:03 +01:00
Jan (janneke) Nieuwenhuizen ef910b87cd
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.
2021-03-21 16:20:03 +01:00
Jan (janneke) Nieuwenhuizen 4f6ef5b77d
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.
2021-03-21 16:16:55 +01:00
Jan (janneke) Nieuwenhuizen f733609590
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.
2021-03-21 16:16:54 +01:00
Jan (janneke) Nieuwenhuizen f1bec74b9a
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.
2021-03-21 16:16:54 +01:00
Jan (janneke) Nieuwenhuizen b07e8591de
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.
2021-03-21 16:16:54 +01:00
Jan (janneke) Nieuwenhuizen 4284a3821a
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.
2021-03-21 16:16:54 +01:00
Jan (janneke) Nieuwenhuizen 78b431c1d4
core: Use unique assert_msg.
* src/mes.c (error): Use unique assert_msg.
2021-03-21 16:16:54 +01:00
Jan (janneke) Nieuwenhuizen 6f11ec9998
core: read_string: Prepare for M2-Planet.
* src/string.c (read_string): Prepare for M2-Planet.
2021-03-21 16:16:54 +01:00
Jan (janneke) Nieuwenhuizen 75313cded0
core: string_equal_p: Prepare for M2-Planet.
* src/string.c (string_equal_p): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen 07d2e97375
core: reader_read_block_comment: Prepare for M2-Planet.
* src/reader.c (reader_read_block_comment): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen c90505607a
core: reader_eat_whitespace: Prepare for M2-Planet.
* src/reader.c (reader_eat_whitespace): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen f030b0f79e
core: reader_read_sexp_: Prepare for M2-Planet.
* src/reader.c (reader_read_sexp_): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen 7464b0e988
core: reader_read_identifier_or_number: Prepare for M2-Planet.
* src/reader.c (reader_read_identifier_or_number): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen e9bec27bfe
core: open_output_file: Prepare for M2-Planet.
* src/posix.c (open_output_file): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen d1080dfd77
core: current_input_port: Prepare for M2-Planet.
* src/posix.c (current_input_port): Prepare for M2-Planet.
2021-03-21 16:16:53 +01:00
Jan (janneke) Nieuwenhuizen 55955bf8d6
core: write_byte: Prepare for M2-Planet.
* src/posix.c (write_byte): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen 3c6264610a
core: read_char: Prepare for M2-Planet.
* src/posix.c (read_char): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen 9e090023b9
core: last_pair: Prepare for M2-Planet.
* src/lib.c (last_pair): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen fd8d056637
core: memq: Prepare for M2-Planet.
* src/lib.c (memq): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen d04c7c1c95
core: xassq: Prepare for M2-Planet.
* src/lib.c (xassq): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen ab158e1e46
core: hash_cstring: Prepare for M2-Planet.
* src/hash.c (hash_cstring): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen ad4f325826
core: eval_apply: Prepare for M2-Planet.
* src/eval-apply.c (eval_apply): Prepare for M2-Planet.
2021-03-21 16:16:52 +01:00
Jan (janneke) Nieuwenhuizen 3e65abf851
core: apply_builtin: Prepare for M2-Planet.
* src/eval-apply.c (apply_builtin): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen 2159ee4e87
core: formal_p: Prepare for M2-Planet.
* src/eval-apply.c (formal_p): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen c9cd874ae8
core: builtin_p: Prepare for M2-Planet.
* src/builtins.c (builtin_p): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen 181b77a2a0
core: assoc: Prepare for M2-Planet.
* src/mes.c (assoc): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen 4e49206c53
core: assq: Prepare for M2-Planet.
* src/mes.c (assq): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen e6b0a7c863
core: eq_p: Prepare for M2-Planet.
* src/mes.c (eq_p): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen 661a1c91d1
core: assoc_string: Prepare for M2-Planet.
src/mes.c (assoc_string): Prepare for M2-Planet.
2021-03-21 16:16:51 +01:00
Jan (janneke) Nieuwenhuizen 83fe819e65
core: Prepare for pointer cells.
* include/mes/cc.h: Prepare for pointer-based cells.
* include/mes/macros.h[POINTER_CELLS]: Alternative set of macros.
* include/mes/mes.h (struct scm)[POINTER_CELLS]: Alternative definition.
* src/gc.c (copy_cell, copy_news): New function.
* include/mes/mes.h: Declare them.
2021-03-21 16:16:50 +01:00