This commit is contained in:
Dominic Grimm 2023-04-04 14:07:21 +02:00
parent 7d96943862
commit fcc8379cc3
Signed by: dergrimm
GPG key ID: 12EFFCAEA9E620BF
6 changed files with 182 additions and 97 deletions

View file

@ -1,6 +1,6 @@
# hence # hence
Virtual CPU with Assembler and Emulator. Virtual CPU with Assembler and Emulator and Forth compiler included.
## Architecture ## Architecture

View file

@ -13,11 +13,12 @@
.define_eval prev, OFFSET .define_eval prev, OFFSET
.bytes CORE_U16_MAX, CORE_U16_MAX .bytes CORE_U16_MAX, CORE_U16_MAX
.bytes CORE_U16_MAX
.define_eval JUMP_TABLE_CONDITIONS_SIZE, (OFFSET - prev) .define_eval JUMP_TABLE_CONDITIONS_SIZE, (OFFSET - prev)
.org prev .org prev
.delete prev .delete prev
.define_eval JUMP_TABLE_WORDS_SIZE, (0 * 2) .define_eval JUMP_TABLE_WORDS_SIZE, (1 * 2)
.define_eval JUMP_TABLE_PTR, (MAIN_JUMPER - JUMP_TABLE_CONDITIONS_SIZE - JUMP_TABLE_WORDS_SIZE) .define_eval JUMP_TABLE_PTR, (MAIN_JUMPER - JUMP_TABLE_CONDITIONS_SIZE - JUMP_TABLE_WORDS_SIZE)
.debug JUMP_TABLE_CONDITIONS_SIZE, JUMP_TABLE_WORDS_SIZE, (JUMP_TABLE_CONDITIONS_SIZE + JUMP_TABLE_WORDS_SIZE / 2), JUMP_TABLE_PTR .debug JUMP_TABLE_CONDITIONS_SIZE, JUMP_TABLE_WORDS_SIZE, (JUMP_TABLE_CONDITIONS_SIZE + JUMP_TABLE_WORDS_SIZE / 2), JUMP_TABLE_PTR
@ -29,6 +30,8 @@
.define_eval counter, (counter + 2) .define_eval counter, (counter + 2)
.define_eval jump_table_conditions_else_0, (JUMP_TABLE_PTR + counter) .define_eval jump_table_conditions_else_0, (JUMP_TABLE_PTR + counter)
.define_eval counter, (counter + 2) .define_eval counter, (counter + 2)
.define_eval jump_table_conditions_if_1, (JUMP_TABLE_PTR + counter)
.define_eval counter, (counter + 2)
.delete counter .delete counter
.define_eval MEM_JUMP_TABLE_LEN, (JUMP_TABLE_CONDITIONS_SIZE + JUMP_TABLE_WORDS_SIZE / 2) .define_eval MEM_JUMP_TABLE_LEN, (JUMP_TABLE_CONDITIONS_SIZE + JUMP_TABLE_WORDS_SIZE / 2)
@ -52,23 +55,40 @@
tlr CORE_REG_A tlr CORE_REG_A
.endmacro .endmacro
; setup jump table .macro jump_table_pull_ptr, jump_table_pull_ptr_arg_0_ptr
; condition 0 .std_get jump_table_pull_ptr_arg_0_ptr
.std_get jump_table_conditions_if_0
tls tls
.std_get (jump_table_conditions_if_0 + 1) .std_get (jump_table_pull_ptr_arg_0_ptr + 1)
tls tls
dbg dbg
pop pop
pop pop
.endmacro
; setup jump table
; conditions
; condition 0
; if
.jump_table_pull_ptr jump_table_conditions_if_0
; else
.jump_table_pull_ptr jump_table_conditions_else_0
; condition 1
; if
.jump_table_pull_ptr jump_table_conditions_if_1
.macro self_ref, self_ref_arg_0_ptr
.std_rset CORE_REG_A, self_ref_arg_0_ptr
.std_set self_ref_arg_0_ptr
.endmacro
; reference MEM_CALL_STACK_PTR to itself ; reference MEM_CALL_STACK_PTR to itself
.std_rset CORE_REG_A, MEM_CALL_STACK_PTR .self_ref MEM_CALL_STACK_PTR
.std_set MEM_CALL_STACK_PTR
; reference MEM_ALLOC_PTR to itself ; reference MEM_ALLOC_PTR to itself
.std_rset CORE_REG_A, MEM_ALLOC_PTR .self_ref MEM_ALLOC_PTR
.std_set MEM_ALLOC_PTR
.delete_macro self_ref
.std_jump MAIN_JUMPER .std_jump MAIN_JUMPER
@ -101,50 +121,20 @@ return_call_stack_jump:
get get
tlr CORE_REG_PC tlr CORE_REG_PC
.define_eval prev, OFFSET
.std_rset CORE_REG_C, CORE_U16_MAX
.std_rset CORE_REG_D, CORE_U16_MAX
ts call_stack_jump
tlr CORE_REG_PC
.define_eval CALL_STACK_JUMP_SIZE, (OFFSET - prev)
.org prev
.delete prev
.macro call_stack_jump, call_stack_jump_arg_0_label .macro call_stack_jump, call_stack_jump_arg_0_label
.define_eval prev, OFFSET
.define offset_till_end, (OFFSET - prev * -1 + CALL_STACK_JUMP_COND_IF_ELSE_SIZE)
.std_rset CORE_REG_C, call_stack_jump_arg_0_label .std_rset CORE_REG_C, call_stack_jump_arg_0_label
.std_rset CORE_REG_D, (OFFSET + offset_till_end) .std_rset CORE_REG_D, (OFFSET + 7)
ts call_stack_jump ts call_stack_jump
tlr CORE_REG_PC tlr CORE_REG_PC
.delete prev, offset_till_end
.endmacro .endmacro
.define_eval prev, OFFSET
.std_ld
tlr CORE_REG_A
.std_rset CORE_REG_C, CORE_U16_MAX
.std_rset CORE_REG_D, CORE_U16_MAX
ts call_stack_jump
tlrc CORE_REG_PC
.define_eval CALL_STACK_JUMP_COND_IF_SIZE, (OFFSET - prev)
.org prev
.delete prev
.macro call_stack_jump_cond_if, call_stack_jump_cond_if_arg_0_if_label .macro call_stack_jump_cond_if, call_stack_jump_cond_if_arg_0_if_label
.define_eval prev, OFFSET
.define offset_till_end, (OFFSET - prev * -1 + CALL_STACK_JUMP_COND_IF_ELSE_SIZE)
.std_ld .std_ld
tlr CORE_REG_A tlr CORE_REG_A
.std_rset CORE_REG_C, call_stack_jump_cond_if_arg_0_if_label .std_rset CORE_REG_C, call_stack_jump_cond_if_arg_0_if_label
.std_rset CORE_REG_D, (OFFSET + offset_till_end) .std_rset CORE_REG_D, (OFFSET + 7)
ts call_stack_jump ts call_stack_jump
tlrc CORE_REG_PC tlrc CORE_REG_PC
.delete prev, offset_till_end
.endmacro .endmacro
.define_eval prev, OFFSET .define_eval prev, OFFSET
@ -188,6 +178,21 @@ return_call_stack_jump:
; data ; data
; strings ; strings
data_strings_0:
.bytes 0x48
.bytes 0x65
.bytes 0x6c
.bytes 0x6c
.bytes 0x6f
.bytes 0x20
.bytes 0x77
.bytes 0x6f
.bytes 0x72
.bytes 0x6c
.bytes 0x64
.bytes 0x21
data_strings_end_0:
; conditions ; conditions
; condition: 0 ; condition: 0
@ -205,8 +210,42 @@ return_call_stack_jump:
.std_set CORE_MEM_OUT .std_set CORE_MEM_OUT
.return_call_stack_jump .return_call_stack_jump
; condition: 1
conditions_if_1:
push 32
.std_ld
tlr CORE_REG_A
.std_set CORE_MEM_OUT
.std_rset CORE_REG_A, '\n'
.std_set CORE_MEM_CHR
.return_call_stack_jump
; words ; words
words_0:
push 40
push 2
.stack_transfer_alu
.std_alu CORE_ALU_ADD
tls
.return_call_stack_jump
; static jump table
.define_eval prev, OFFSET
; conditions
; condition: 0
.org jump_table_conditions_if_0
.bytes conditions_if_0
.org jump_table_conditions_else_0
.bytes conditions_else_0
; condition: 1
.org jump_table_conditions_if_1
.bytes conditions_if_1
.org prev
.delete prev
; main ; main
main: main:
@ -224,4 +263,46 @@ main:
.call_stack_jump_cond_if_else conditions_if_0, conditions_else_0 .call_stack_jump_cond_if_else conditions_if_0, conditions_else_0
.std_rset CORE_REG_A, '\n' .std_rset CORE_REG_A, '\n'
.std_set CORE_MEM_CHR .std_set CORE_MEM_CHR
push 1
dbg
.call_stack_jump_cond_if conditions_if_1
.call_stack_jump words_0
dbg
.call_stack_jump words_0
dbg
.std_rset CORE_REG_A, ' '
.std_set CORE_MEM_CHR
.std_rset CORE_REG_B, data_strings_0
loop_strings_0:
tsr CORE_REG_B
get
tlr CORE_REG_A
.std_set CORE_MEM_CHR
.std_rset CORE_REG_A, 1
.std_alu CORE_ALU_ADD
tlr CORE_REG_B
.std_rset CORE_REG_A, data_strings_end_0
.std_alu CORE_ALU_GT
tlr CORE_REG_A
.std_cond_jump loop_strings_0
.std_rset CORE_REG_A, '\n'
.std_set CORE_MEM_CHR
.std_rset CORE_REG_A, ' '
.std_set CORE_MEM_CHR
set
.std_rset CORE_REG_B, data_strings_0
loop_strings_0:
tsr CORE_REG_B
get
tlr CORE_REG_A
.std_set CORE_MEM_CHR
.std_rset CORE_REG_A, 1
.std_alu CORE_ALU_ADD
tlr CORE_REG_B
.std_rset CORE_REG_A, data_strings_end_0
.std_alu CORE_ALU_GT
tlr CORE_REG_A
.std_cond_jump loop_strings_0
.std_rset CORE_REG_A, '\n'
.std_set CORE_MEM_CHR
.std_stop .std_stop

View file

@ -5,4 +5,6 @@
: borg debug ; : borg debug ;
42 42 = debug if 69 . else 420 . then cr 42 42 = debug if 69 . else 420 . then cr
1 debug if 32 . cr else then
test debug test debug space ." Hello world!" cr space space ." Hello world!" cr

View file

@ -131,6 +131,21 @@ impl Assembler {
Ok(None) Ok(None)
} }
"debug_program" => {
let start = args[0].resolve_number(self)?;
let end = args[1].resolve_number(self)?;
println!(
"=== Hexdump [0x{:0>4x}..0x{:0>4x}] ===\n{}\n================================",
start,
end,
rhexdump::hexdump_offset(
&self.program[start as usize..end as usize],
start as u32,
)
);
Ok(None)
}
"define" => { "define" => {
let name = match &args[0] { let name = match &args[0] {
arg::Arg::Variable(x) | arg::Arg::String(x) => x, arg::Arg::Variable(x) | arg::Arg::String(x) => x,

View file

@ -292,7 +292,7 @@ impl Emulator {
0x0c => { 0x0c => {
self.set_memory(self.tmp, self.reg_a)?; self.set_memory(self.tmp, self.reg_a)?;
} }
_ => bail!("Invalid opcode: 0x{:0>4x}", self.reg_opc), _ => bail!("Invalid opcode: 0x{:0>2x}", self.reg_opc),
} }
Ok(()) Ok(())

View file

@ -1,7 +1,3 @@
{%- macro escape_name(name) -%}
{% if name.starts_with('"') %}{{ name }}{% else %}"{{ name }}"{% endif %}
{%- endmacro -%}
; Generated by Henceforth {{ env!("CARGO_PKG_VERSION") }} ({{ env!("CARGO_PKG_REPOSITORY") }}) ; Generated by Henceforth {{ env!("CARGO_PKG_VERSION") }} ({{ env!("CARGO_PKG_REPOSITORY") }})
.include "$lib/core.asm" .include "$lib/core.asm"
@ -62,26 +58,41 @@
tlr CORE_REG_A tlr CORE_REG_A
.endmacro .endmacro
.macro jump_table_pull_ptr, jump_table_pull_ptr_arg_0_ptr
.std_get jump_table_pull_ptr_arg_0_ptr
tls
.std_get (jump_table_pull_ptr_arg_0_ptr + 1)
tls
dbg
pop
pop
.endmacro
; setup jump table ; setup jump table
; conditions ; conditions
{%- for c in conditions %} {%- for c in conditions %}
; condition {{ c.id }} ; condition {{ c.id }}
.std_get jump_table_conditions_if_{{ c.id }} ; if
tls .jump_table_pull_ptr jump_table_conditions_if_{{ c.id }}
.std_get (jump_table_conditions_if_{{ c.id }} + 1) {%- if !c.data.1.is_empty() %}
tls
dbg ; else
pop .jump_table_pull_ptr jump_table_conditions_else_{{ c.id }}
pop {%- endif %}
{%- endfor %} {%- endfor %}
.macro self_ref, self_ref_arg_0_ptr
.std_rset CORE_REG_A, self_ref_arg_0_ptr
.std_set self_ref_arg_0_ptr
.endmacro
; reference MEM_CALL_STACK_PTR to itself ; reference MEM_CALL_STACK_PTR to itself
.std_rset CORE_REG_A, MEM_CALL_STACK_PTR .self_ref MEM_CALL_STACK_PTR
.std_set MEM_CALL_STACK_PTR
; reference MEM_ALLOC_PTR to itself ; reference MEM_ALLOC_PTR to itself
.std_rset CORE_REG_A, MEM_ALLOC_PTR .self_ref MEM_ALLOC_PTR
.std_set MEM_ALLOC_PTR
.delete_macro self_ref
.std_jump MAIN_JUMPER .std_jump MAIN_JUMPER
@ -114,50 +125,20 @@ return_call_stack_jump:
get get
tlr CORE_REG_PC tlr CORE_REG_PC
.define_eval prev, OFFSET
.std_rset CORE_REG_C, CORE_U16_MAX
.std_rset CORE_REG_D, CORE_U16_MAX
ts call_stack_jump
tlr CORE_REG_PC
.define_eval CALL_STACK_JUMP_SIZE, (OFFSET - prev)
.org prev
.delete prev
.macro call_stack_jump, call_stack_jump_arg_0_label .macro call_stack_jump, call_stack_jump_arg_0_label
.define_eval prev, OFFSET
.define offset_till_end, (OFFSET - prev * -1 + CALL_STACK_JUMP_COND_IF_ELSE_SIZE)
.std_rset CORE_REG_C, call_stack_jump_arg_0_label .std_rset CORE_REG_C, call_stack_jump_arg_0_label
.std_rset CORE_REG_D, (OFFSET + offset_till_end) .std_rset CORE_REG_D, (OFFSET + 7)
ts call_stack_jump ts call_stack_jump
tlr CORE_REG_PC tlr CORE_REG_PC
.delete prev, offset_till_end
.endmacro .endmacro
.define_eval prev, OFFSET
.std_ld
tlr CORE_REG_A
.std_rset CORE_REG_C, CORE_U16_MAX
.std_rset CORE_REG_D, CORE_U16_MAX
ts call_stack_jump
tlrc CORE_REG_PC
.define_eval CALL_STACK_JUMP_COND_IF_SIZE, (OFFSET - prev)
.org prev
.delete prev
.macro call_stack_jump_cond_if, call_stack_jump_cond_if_arg_0_if_label .macro call_stack_jump_cond_if, call_stack_jump_cond_if_arg_0_if_label
.define_eval prev, OFFSET
.define offset_till_end, (OFFSET - prev * -1 + CALL_STACK_JUMP_COND_IF_ELSE_SIZE)
.std_ld .std_ld
tlr CORE_REG_A tlr CORE_REG_A
.std_rset CORE_REG_C, call_stack_jump_cond_if_arg_0_if_label .std_rset CORE_REG_C, call_stack_jump_cond_if_arg_0_if_label
.std_rset CORE_REG_D, (OFFSET + offset_till_end) .std_rset CORE_REG_D, (OFFSET + 7)
ts call_stack_jump ts call_stack_jump
tlrc CORE_REG_PC tlrc CORE_REG_PC
.delete prev, offset_till_end
.endmacro .endmacro
.define_eval prev, OFFSET .define_eval prev, OFFSET
@ -204,9 +185,6 @@ return_call_stack_jump:
{%- for s in strings %} {%- for s in strings %}
{% let bytes = s.data.as_bytes() -%} {% let bytes = s.data.as_bytes() -%}
data_strings_{{ s.id }}: data_strings_{{ s.id }}:
{% let name = snailquote::escape(s.data) -%}
; original : {% call escape_name(name) %}
; size : {{ bytes.len() }}
{%- for byte in bytes %} {%- for byte in bytes %}
.bytes {{ "0x{:02x}"|format(byte) }} .bytes {{ "0x{:02x}"|format(byte) }}
{%- endfor %} {%- endfor %}
@ -221,28 +199,37 @@ return_call_stack_jump:
{{ ins }} {{ ins }}
{%- endfor %} {%- endfor %}
.return_call_stack_jump .return_call_stack_jump
{%- if !c.data.1.is_empty() %}
conditions_else_{{ c.id }}: conditions_else_{{ c.id }}:
{%- for ins in c.data.1 %} {%- for ins in c.data.1 %}
{{ ins }} {{ ins }}
{%- endfor %} {%- endfor %}
.return_call_stack_jump .return_call_stack_jump
{%- endif %}
{% endfor %} {% endfor %}
; words ; words
{%- for w in words %} {%- for w in words %}
words_{{ w.id }}: words_{{ w.id }}:
{% let name = snailquote::escape(w.data.0) -%}
; name : {% call escape_name(name) %}
{%- for node in w.data.1 %} {%- for node in w.data.1 %}
{{ node }} {{ node }}
{%- endfor %} {%- endfor %}
.return_call_stack_jump .return_call_stack_jump
{% endfor %} {% endfor %}
; static jump table
.define_eval prev, OFFSET .define_eval prev, OFFSET
.org JUMP_TABLE_PTR ; conditions
{%- for c in conditions %}
; condition: {{ c.id }}
.org jump_table_conditions_if_{{ c.id }}
.bytes conditions_if_{{ c.id }}
{%- if !c.data.1.is_empty() %}
.org jump_table_conditions_else_{{ c.id }}
.bytes conditions_else_{{ c.id }}
{%- endif %}
{% endfor %}
.org prev .org prev
.delete prev .delete prev