Commit Graph

1881 Commits

Author SHA1 Message Date
Jan Nieuwenhuizen 3427368d31
kaem: scaffold/read.kaem.
* .gitignore: Update.
* include/linux/x86/syscall.h: Update for M2-Planet.
* scaffold/read.c: Update for M2-Planet.
* lib/stdlib/malloc.c (malloc): Remove cast for M2-Planet.
* lib/string/memset.c (memset): Update for M2-Planet.
* lib/linux/brk.c (brk): Remove cast for M2-Planet.
2019-11-17 12:25:40 +01:00
Jan Nieuwenhuizen 54c18f998a
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.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen b9630faf05
kaem: scaffold/hello.kaem.
* include/m2/lib.h: New file.
* scaffold/hello.kaem: New file.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen 56ee7781a5
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.
* scaffold/main.c: Update for M2-Planet.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen 69cff15c1b
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.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen 04126ad14a
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.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen f3efd4e689
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.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen 60fb2e2d46
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.
2019-11-17 12:25:39 +01:00
Jan Nieuwenhuizen d2f1f75703
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.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen 813a92855f
core: Use unique assert_msg.
* src/mes.c (error): Use unique assert_msg.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen ca5140c714
core: read_string: Prepare for M2-Planet.
* src/string.c (read_string): Prepare for M2-Planet.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen 058dfc74ea
core: string_equal_p: Prepare for M2-Planet.
* src/string.c (string_equal_p): Prepare for M2-Planet.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen 1ac06460a6
core: reader_read_block_comment: Prepare for M2-Planet.
* src/reader.c (reader_read_block_comment): Prepare for M2-Planet.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen ec490ef2fd
core: reader_eat_whitespace: Prepare for M2-Planet.
* src/reader.c (reader_eat_whitespace): Prepare for M2-Planet.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen eb48442b50
core: reader_read_sexp_: Prepare for M2-Planet.
* src/reader.c (reader_read_sexp_): Prepare for M2-Planet.
2019-11-17 12:25:38 +01:00
Jan Nieuwenhuizen 5a2f0c19b9
core: reader_read_identifier_or_number: Prepare for M2-Planet.
* src/reader.c (reader_read_identifier_or_number): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen f0cb62063a
core: open_output_file: Prepare for M2-Planet.
* src/posix.c (open_output_file): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen df019a63d4
core: current_input_port: Prepare for M2-Planet.
* src/posix.c (current_input_port): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen cc3aa2b306
core: write_byte: Prepare for M2-Planet.
* src/posix.c (write_byte): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen 0e4830a035
core: read_char: Prepare for M2-Planet.
* src/posix.c (read_char): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen 158761a486
core: last_pair: Prepare for M2-Planet.
* src/lib.c (last_pair): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen 89e3418a57
core: memq: Prepare for M2-Planet.
* src/lib.c (memq): Prepare for M2-Planet.
2019-11-17 12:25:37 +01:00
Jan Nieuwenhuizen a85fdebe4f
core: xassq: Prepare for M2-Planet.
* src/lib.c (xassq): Prepare for M2-Planet.
2019-11-17 12:25:36 +01:00
Jan Nieuwenhuizen 2b0c2b821c
core: hash_cstring: Prepare for M2-Planet.
* src/hash.c (hash_cstring): Prepare for M2-Planet.
2019-11-17 12:25:36 +01:00
Jan Nieuwenhuizen eb87158f8c
core: eval_apply: Prepare for M2-Planet.
* src/eval-apply.c (eval_apply): Prepare for M2-Planet.
2019-11-17 12:25:36 +01:00
Jan Nieuwenhuizen 6afd8e7a3c
core: apply_builtin: Prepare for M2-Planet.
* src/eval-apply.c (apply_builtin): Prepare for M2-Planet.
2019-11-17 12:25:36 +01:00
Jan Nieuwenhuizen 2b7d8ba6fa
core: formal_p: Prepare for M2-Planet.
* src/eval-apply.c (formal_p): Prepare for M2-Planet.
2019-11-17 12:25:36 +01:00
Jan Nieuwenhuizen 18d91a9c59
core: builtin_p: Prepare for M2-Planet.
* src/builtins.c (builtin_p): Prepare for M2-Planet.
2019-11-17 12:25:36 +01:00
Jan Nieuwenhuizen b79374e7ae
core: assoc: Prepare for M2-Planet.
* src/mes.c (assoc): Prepare for M2-Planet.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen b2f571c800
core: assq: Prepare for M2-Planet.
* src/mes.c (assq): Prepare for M2-Planet.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen 417a6b9df7
core: eq_p: Prepare for M2-Planet.
* src/mes.c (eq_p): Prepare for M2-Planet.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen 2675807d12
core: assoc_string: Prepare for M2-Planet.
src/mes.c (assoc_string): Prepare for M2-Planet.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen 0d08d198a3
build: Add pointer.sh.
* build-aux/pointer.sh: New script.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen 56ecae96d0
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.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen f59f2d9ec3
core: gc: FRAME_SIZE.
* src/gc.c (FRAME_SIZE): New constant.
(gc_loop, gc_): Use it.
2019-11-17 12:25:35 +01:00
Jan Nieuwenhuizen 2cbb3e1860
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.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen 381bb3f62a
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.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen 8db2b44d8e
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.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen c01ea57e69
core: Prepare for conversion to pointer cells.
* src/posix.c (execl_): Prepare for conversion to pointer cells.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen 52b06bff98
core: Remove dead macros.
* include/mes/macros.h (CSTRING_STRUCT, START, LEN): Remove.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen 8eca568745
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.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen 1d1387f069
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.
2019-11-17 12:25:34 +01:00
Jan Nieuwenhuizen 9f956d9206
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.
2019-11-17 12:25:33 +01:00
Jan Nieuwenhuizen 7c0cb60709
core: Refactor display. 2019-11-17 12:25:33 +01:00
Jan Nieuwenhuizen f4cbbf620c
core: Upcase register names.
* include/mes/mes.h (R0, R1, R2, R3, M0): Rename from lower case.
Update users.
2019-11-17 12:25:33 +01:00
Jan Nieuwenhuizen d9fccb532a
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.
2019-11-17 12:25:33 +01:00
Jan Nieuwenhuizen 5f5066aaea
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.
2019-11-17 12:25:33 +01:00
Jan Nieuwenhuizen fe4a19c10f
core: eval-apply: Fix formal_p.
* src/eval-apply.c (formal_p): Return boolean.
2019-11-17 12:25:33 +01:00
Jan Nieuwenhuizen 693921e059
core: Split-out eval-apply.c.
* src/mes.c (check_formals, check_apply, pairlis, set_car_x, set_cdr_x,
set_env_x, call_lambda, make_closure_, make_variable_, macro_get_handle,
get_macro, macro_set_x, push_cc, add_formals, formal_p,
expand_variable_, expand_variable, apply_builtin, eval_apply, apply):
Move to ..
* src/eval-apply.c: New file.
* build-aux/configure-lib.sh (mes_SOURCES): Add it.
* simple.make: Likewise.
* src/eval.c (assert_defined): Likewise.
2019-11-17 12:25:32 +01:00
Jan Nieuwenhuizen 50156e6c07
build: Update mes-snarf.
* build-aux/snarf.sh: Support C-style annotations.
2019-11-17 12:25:32 +01:00