Commit Graph

2089 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen 0c1e7882fe
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-05-02 16:34:54 +02:00
Jan (janneke) Nieuwenhuizen 900da03a96
mescc: Mes C Library: Bugfix __ungetc_clear.
* lib/m2/mes_open.c (mes_open): Remove __ungetc_init ();
* lib/m2/open.c (open): Likewise.
2021-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen d70584e040
kaem: scaffold/read.kaem.
* .gitignore: Update.
* include/linux/x86/syscall.h: Update for M2-Planet.
* scaffold/read.c: Update for M2-Planet.
* lib/m2/malloc.c: New file.
* lib/string/memset.c (memset): Update for M2-Planet.
* lib/linux/brk.c (brk): Remove cast for M2-Planet.
2021-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen f8cd020f87
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.
2021-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen 348b082b06
kaem: scaffold/hello.kaem.
* include/m2/lib.h: New file.
* scaffold/hello.kaem: New file.
2021-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen db711f51fa
kaem: scaffold/main.kaem.
* .gitignore: Update.
* lib/linux/x86-mes-m2/crt1.M1: New file.
* lib/linux/x86-mes-m2/crt1.c: New file.
* lib/m2/x86/x86_defs.M1: New file.  Import from stage0.
* lib/m2/x86/ELF-i386-debug.hex2: New file.  Import from M2-Planet.
* scaffold/main.c: Update for M2-Planet.
* scaffold/main.kaem: New file.
2021-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen 90158d7153
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-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen c53c801090
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-05-02 16:34:53 +02:00
Jan (janneke) Nieuwenhuizen da27e1112d
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-05-02 16:34:52 +02:00
Jan (janneke) Nieuwenhuizen 86a859a756
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-05-02 16:34:52 +02:00
Jan (janneke) Nieuwenhuizen e49c5918e4
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-05-02 16:34:52 +02:00
Jan (janneke) Nieuwenhuizen a2d7361f72
core: Use unique assert_msg.
* src/mes.c (error): Use unique assert_msg.
2021-05-02 16:34:52 +02:00
Jan (janneke) Nieuwenhuizen 32e14767a6
core: read_string: Prepare for M2-Planet.
* src/string.c (read_string): Prepare for M2-Planet.
2021-05-02 16:34:52 +02:00
Jan (janneke) Nieuwenhuizen 67b3874782
core: string_equal_p: Prepare for M2-Planet.
* src/string.c (string_equal_p): Prepare for M2-Planet.
2021-05-02 16:34:52 +02:00
Jan (janneke) Nieuwenhuizen c7afb46a1e
core: reader_read_block_comment: Prepare for M2-Planet.
* src/reader.c (reader_read_block_comment): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen dccb99f773
core: reader_eat_whitespace: Prepare for M2-Planet.
* src/reader.c (reader_eat_whitespace): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen eb6ee89236
core: reader_read_sexp_: Prepare for M2-Planet.
* src/reader.c (reader_read_sexp_): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen f75cb33459
core: reader_read_identifier_or_number: Prepare for M2-Planet.
* src/reader.c (reader_read_identifier_or_number): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen 0a5de922bd
core: open_output_file: Prepare for M2-Planet.
* src/posix.c (open_output_file): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen 9861ab8ad3
core: current_input_port: Prepare for M2-Planet.
* src/posix.c (current_input_port): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen 0ad61e2155
core: write_byte: Prepare for M2-Planet.
* src/posix.c (write_byte): Prepare for M2-Planet.
2021-05-02 16:34:51 +02:00
Jan (janneke) Nieuwenhuizen f73e0086a8
core: read_char: Prepare for M2-Planet.
* src/posix.c (read_char): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen f6fdc5987d
core: last_pair: Prepare for M2-Planet.
* src/lib.c (last_pair): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen 79d255ab19
core: memq: Prepare for M2-Planet.
* src/lib.c (memq): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen 39ab8f0d94
core: xassq: Prepare for M2-Planet.
* src/lib.c (xassq): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen 61f26e3cca
core: hash_cstring: Prepare for M2-Planet.
* src/hash.c (hash_cstring): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen 16ad36fa38
core: eval_apply: Prepare for M2-Planet.
* src/eval-apply.c (eval_apply): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen 6b1f35b8fb
core: apply_builtin: Prepare for M2-Planet.
* src/eval-apply.c (apply_builtin): Prepare for M2-Planet.
2021-05-02 16:34:50 +02:00
Jan (janneke) Nieuwenhuizen a4c2e17584
core: formal_p: Prepare for M2-Planet.
* src/eval-apply.c (formal_p): Prepare for M2-Planet.
2021-05-02 16:34:49 +02:00
Jan (janneke) Nieuwenhuizen d78706138a
core: builtin_p: Prepare for M2-Planet.
* src/builtins.c (builtin_p): Prepare for M2-Planet.
2021-05-02 16:34:49 +02:00
Jan (janneke) Nieuwenhuizen 60661d0ba4
core: assoc: Prepare for M2-Planet.
* src/mes.c (assoc): Prepare for M2-Planet.
2021-05-02 16:34:49 +02:00
Jan (janneke) Nieuwenhuizen b0a6a2221f
core: assq: Prepare for M2-Planet.
* src/mes.c (assq): Prepare for M2-Planet.
2021-05-02 16:34:49 +02:00
Jan (janneke) Nieuwenhuizen f31e746adc
core: eq_p: Prepare for M2-Planet.
* src/mes.c (eq_p): Prepare for M2-Planet.
2021-05-02 16:34:49 +02:00
Jan (janneke) Nieuwenhuizen 397b2f03c5
core: assoc_string: Prepare for M2-Planet.
src/mes.c (assoc_string): Prepare for M2-Planet.
2021-05-02 16:34:49 +02:00
Jan (janneke) Nieuwenhuizen b644fa888c
build: Add pointer.sh.
* build-aux/pointer.sh: New script.
2021-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen 8346d78859
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-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen 46b3e57f4c
core: gc: FRAME_SIZE.
* src/gc.c (gc_loop, gc_): Use FRAME_SIZE.
2021-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen e85a8acae9
core: gc: Fixes.
* src/gc.c (gc_init, gc_up_arena, gc_flip): Change to void function.
Fixes 0 returns.
(make_bytes): Use plain.
(make_string): Add 1 to length, for zero-terminated C strings.
(gc_copy): Use plain bytes length.
(gc_loop): Manually reformat.
2021-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen fc0bc0cd4d
core: Create symbols dynamically.
* include/mes/symbols.h: New file.
* include/mes/mes.hh: Include it.
* include/mes/constants.h: Remove symbol constants.
* src/symbols.c (init_symbols): Create symbols dynamically.
* build-aux/mes-snarf.scm (snarf-symbols): Update.
2021-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen 2136b84c60
core: Remove CBYTES, CSTRING, NCBYTES macros.
* src/gc.c (cell_bytes, news_bytes): New function.
* include/mes/macros.h (CBYTES, CSTRING, NCBYTES): Remove.  Update
users.
* include/mes/m2.h: Likewise.
2021-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen 8d35e811b4
core: Prepare for conversion to pointer cells.
* src/posix.c (execl_): Prepare for conversion to pointer cells.
2021-05-02 16:34:48 +02:00
Jan (janneke) Nieuwenhuizen c196ed9f08
core: Remove dead macros.
* include/mes/macros.h (CSTRING_STRUCT, START, LEN): Remove.
2021-05-02 16:34:47 +02:00
Jan (janneke) Nieuwenhuizen 2f7c5b2fc0
core: Remove macros from cell creation: make_char .. make_string.
* src/gc.c (make_char, make_continuation, make_macro, make_number,
make_ref, make_string0, make_string_port): New function.
(make_string): Move from string.c.
* include/mes/macros.h (MAKE_CHAR, MAKE_CONTINUATION, MAKE_MACRO,
MAKE_NUMBER, MAKE_REF, MAKE_STRING0, MAKE_STRING_PORT): Remove macro.
Update users.
* include/mes/m2.h: Likewise.
2021-05-02 16:34:47 +02:00
Jan (janneke) Nieuwenhuizen d03bd99795
core: Remove macros from cell creation: make_bytes.
* src/gc.c (bytes_cells, make_bytes): Move from string.c.
* include/mes/macros.h (MAKE_BYTES0, NAME_SYMBOL): Remove.
* include/mes/m2.h: Likewise.
2021-05-02 16:34:47 +02:00
Jan (janneke) Nieuwenhuizen 72318b3b77
core: Remove core:make-cell.
* src/gc.c (alloc, make_cell, cons): Move from mes.c
* src/mes.c: (make_cell_): Remove.
* src/lib.c (char_to_integer, integer_to_char): New function.
* src/builtins.c (mes_builtins): Add them; remove make_cell_.
* mes/module/mes/type-0.mes (char->integer, integer->char): Remove.
2021-05-02 16:34:47 +02:00
Jan (janneke) Nieuwenhuizen 94f335542c
core: Refactor display. 2021-05-02 16:34:47 +02:00
Jan (janneke) Nieuwenhuizen 4362b5ef28
core: Upcase register names.
* include/mes/mes.h (R0, R1, R2, R3, M0): Rename from lower case.
Update users.
2021-05-02 16:34:47 +02:00
Jan (janneke) Nieuwenhuizen 3338bf681d
core: Split-out symbol.c.
* src/mes.c (init_symbol, mes_symbols): Move to ..
* src/symbol.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make: Likewise.
* include/mes/mes.h: Declare init_symbols.
2021-05-02 16:34:46 +02:00
Jan (janneke) Nieuwenhuizen c96a6b8f47
core: Split-out display.c.
* src/lib.c (display_helper, display_, display_error_, display_port_,
write_, write_error_, write_port_, fdisplay_): Move to ..
* src/display.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make: Likewise.
2021-05-02 16:34:46 +02:00
Jan (janneke) Nieuwenhuizen 7f8b106778
core: eval-apply: Fix formal_p.
* src/eval-apply.c (formal_p): Return boolean.
2021-05-02 16:34:46 +02:00