Commit Graph

2089 Commits

Author SHA1 Message Date
Jan (janneke) Nieuwenhuizen dadb54a984
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-05-02 13:27:39 +02:00
Jan (janneke) Nieuwenhuizen a6fb721774
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 13:27:39 +02:00
Jan (janneke) Nieuwenhuizen 2719ed9a62
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 13:27:39 +02:00
Jan (janneke) Nieuwenhuizen 365b6a70f5
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 13:27:35 +02:00
Jan (janneke) Nieuwenhuizen 2e4a71d936
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 13:13:47 +02:00
Jan (janneke) Nieuwenhuizen 42f0ba9b81
kaem: scaffold/hello.kaem.
* include/m2/lib.h: New file.
* scaffold/hello.kaem: New file.
2021-05-02 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen 7d24df3dab
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 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen 2e1b3fdc0e
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 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen b41dc3cd08
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 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen a926e82888
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 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen 5b86d727e6
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 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen 4150bef93c
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 13:13:46 +02:00
Jan (janneke) Nieuwenhuizen 6722e4b81f
core: Use unique assert_msg.
* src/mes.c (error): Use unique assert_msg.
2021-05-02 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen 842abf7d50
core: read_string: Prepare for M2-Planet.
* src/string.c (read_string): Prepare for M2-Planet.
2021-05-02 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen 32cd71c9d2
core: string_equal_p: Prepare for M2-Planet.
* src/string.c (string_equal_p): Prepare for M2-Planet.
2021-05-02 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen 5b10e64d77
core: reader_read_block_comment: Prepare for M2-Planet.
* src/reader.c (reader_read_block_comment): Prepare for M2-Planet.
2021-05-02 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen 3d66ff8679
core: reader_eat_whitespace: Prepare for M2-Planet.
* src/reader.c (reader_eat_whitespace): Prepare for M2-Planet.
2021-05-02 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen d87fc29e24
core: reader_read_sexp_: Prepare for M2-Planet.
* src/reader.c (reader_read_sexp_): Prepare for M2-Planet.
2021-05-02 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen 1215443533
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 13:13:45 +02:00
Jan (janneke) Nieuwenhuizen 90f5b58b3f
core: open_output_file: Prepare for M2-Planet.
* src/posix.c (open_output_file): Prepare for M2-Planet.
2021-05-02 13:13:44 +02:00
Jan (janneke) Nieuwenhuizen 08139fbb41
core: current_input_port: Prepare for M2-Planet.
* src/posix.c (current_input_port): Prepare for M2-Planet.
2021-05-02 13:13:44 +02:00
Jan (janneke) Nieuwenhuizen 0bfcd9cea2
core: write_byte: Prepare for M2-Planet.
* src/posix.c (write_byte): Prepare for M2-Planet.
2021-05-02 13:13:44 +02:00
Jan (janneke) Nieuwenhuizen 7f0a1c00a6
core: read_char: Prepare for M2-Planet.
* src/posix.c (read_char): Prepare for M2-Planet.
2021-05-02 13:13:44 +02:00
Jan (janneke) Nieuwenhuizen 29da2e37b9
core: last_pair: Prepare for M2-Planet.
* src/lib.c (last_pair): Prepare for M2-Planet.
2021-05-02 13:13:44 +02:00
Jan (janneke) Nieuwenhuizen 7ab8b3e960
core: memq: Prepare for M2-Planet.
* src/lib.c (memq): Prepare for M2-Planet.
2021-05-02 13:13:44 +02:00
Jan (janneke) Nieuwenhuizen 6c4b2fde34
core: xassq: Prepare for M2-Planet.
* src/lib.c (xassq): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen dc94ea7c9d
core: hash_cstring: Prepare for M2-Planet.
* src/hash.c (hash_cstring): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen 1400dff2a3
core: eval_apply: Prepare for M2-Planet.
* src/eval-apply.c (eval_apply): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen 6563e7f84d
core: apply_builtin: Prepare for M2-Planet.
* src/eval-apply.c (apply_builtin): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen 886c99520f
core: formal_p: Prepare for M2-Planet.
* src/eval-apply.c (formal_p): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen bfa8558363
core: builtin_p: Prepare for M2-Planet.
* src/builtins.c (builtin_p): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen b79b77859c
core: assoc: Prepare for M2-Planet.
* src/mes.c (assoc): Prepare for M2-Planet.
2021-05-02 13:13:43 +02:00
Jan (janneke) Nieuwenhuizen d12ce7c866
core: assq: Prepare for M2-Planet.
* src/mes.c (assq): Prepare for M2-Planet.
2021-05-02 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen 3d243e1ab7
core: eq_p: Prepare for M2-Planet.
* src/mes.c (eq_p): Prepare for M2-Planet.
2021-05-02 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen de53a2d78d
core: assoc_string: Prepare for M2-Planet.
src/mes.c (assoc_string): Prepare for M2-Planet.
2021-05-02 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen d89280ba3f
build: Add pointer.sh.
* build-aux/pointer.sh: New script.
2021-05-02 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen 96fd91485c
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 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen f026372fb7
core: gc: FRAME_SIZE.
* src/gc.c (gc_loop, gc_): Use FRAME_SIZE.
2021-05-02 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen 6558cab5c7
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 13:13:42 +02:00
Jan (janneke) Nieuwenhuizen bb9f15551c
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 13:13:41 +02:00
Jan (janneke) Nieuwenhuizen 4d15835227
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 13:13:41 +02:00
Jan (janneke) Nieuwenhuizen 30a58c2505
core: Prepare for conversion to pointer cells.
* src/posix.c (execl_): Prepare for conversion to pointer cells.
2021-05-02 13:13:41 +02:00
Jan (janneke) Nieuwenhuizen 3554300442
core: Remove dead macros.
* include/mes/macros.h (CSTRING_STRUCT, START, LEN): Remove.
2021-05-02 13:13:41 +02:00
Jan (janneke) Nieuwenhuizen 162097da0d
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 13:13:41 +02:00
Jan (janneke) Nieuwenhuizen ac05526406
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 13:13:41 +02:00
Jan (janneke) Nieuwenhuizen 8c31947c29
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 13:13:40 +02:00
Jan (janneke) Nieuwenhuizen ccb7d45a1c
core: Refactor display. 2021-05-02 13:13:40 +02:00
Jan (janneke) Nieuwenhuizen d7477d1590
core: Upcase register names.
* include/mes/mes.h (R0, R1, R2, R3, M0): Rename from lower case.
Update users.
2021-05-02 13:13:40 +02:00
Jan (janneke) Nieuwenhuizen 7804bd52e0
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 13:13:40 +02:00
Jan (janneke) Nieuwenhuizen d721d93541
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 13:13:40 +02:00