finish console implementation and add file device
This commit is contained in:
parent
373a739c8f
commit
7f99b487df
3 changed files with 296 additions and 22 deletions
113
exe/uxnemu.ml
113
exe/uxnemu.ml
|
|
@ -64,14 +64,11 @@ let print_stack ~name (Machine.Stack { data; sp }) =
|
|||
(Fmt.on_bytes (Fmt.octets ()))
|
||||
(Bytes.sub data 0 sp)
|
||||
|
||||
let rec run m pc =
|
||||
let console_vector = ref 0
|
||||
|
||||
let run m pc =
|
||||
let dev = Machine.dev m in
|
||||
let console_vector = ref 0 in
|
||||
let console_input ch ty =
|
||||
Bytes.set_uint8 dev 0x12 ch;
|
||||
Bytes.set_uint8 dev 0x17 ty;
|
||||
if Bytes.get_uint8 dev 0x0f = 0 then run m !console_vector
|
||||
in
|
||||
let ram = Machine.ram m in
|
||||
try Machine.dispatch ~trace:debug m pc with
|
||||
| effect Machine.Trace (pc, instr, args), k when debug ->
|
||||
Fmt.epr "PC = %04x | %6s %a@." pc (Instr.to_string instr)
|
||||
|
|
@ -80,14 +77,6 @@ let rec run m pc =
|
|||
Out_channel.flush stderr;
|
||||
continue k ()
|
||||
| effect Machine.Trace _, k -> continue k ()
|
||||
| effect Machine.BRK, _ when !console_vector != 0 -> (
|
||||
try
|
||||
while Bytes.get_uint8 dev 0x0f = 0 do
|
||||
match In_channel.input_byte stdin with
|
||||
| None -> raise Exit
|
||||
| Some c -> console_input c 1
|
||||
done
|
||||
with Exit -> console_input 0 4)
|
||||
| effect Machine.BRK, _ -> ()
|
||||
| effect Machine.DEI (`Byte, port), k ->
|
||||
let value =
|
||||
|
|
@ -119,15 +108,67 @@ let rec run m pc =
|
|||
Out_channel.flush stderr
|
||||
end
|
||||
| 0x0f -> Bytes.set_uint8 dev 0x0f value
|
||||
| 0x10 -> console_vector := value
|
||||
| 0x18 -> print_char (Char.chr value)
|
||||
| 0x19 -> prerr_char (Char.chr value)
|
||||
| 0x10 -> console_vector := Bytes.get_uint16_be dev 0x10
|
||||
| 0x18 ->
|
||||
print_char (Char.chr value);
|
||||
Out_channel.flush stdout
|
||||
| 0x19 ->
|
||||
prerr_char (Char.chr value);
|
||||
Out_channel.flush stderr
|
||||
| 0xaa -> Varvara.File.file_lengths.(0) <- Bytes.get_uint16_be dev 0xaa
|
||||
| 0xa4 ->
|
||||
let addr = Bytes.get_uint16_be dev 0xa4 in
|
||||
let len = Varvara.File.file_lengths.(0) in
|
||||
let result = Varvara.File.file_stat ram 0 addr len in
|
||||
Varvara.File.file_success dev 0xa2 result
|
||||
| 0xa6 ->
|
||||
let result = Varvara.File.file_delete 0 in
|
||||
Varvara.File.file_success dev 0xa2 (if result = 0 then 1 else 0)
|
||||
| 0xa8 ->
|
||||
let addr = Bytes.get_uint16_be dev 0xa8 in
|
||||
let result = Varvara.File.file_init ram 0 addr in
|
||||
Varvara.File.file_success dev 0xa2 result
|
||||
| 0xac ->
|
||||
let addr = Bytes.get_uint16_be dev 0xac in
|
||||
let len = Varvara.File.file_lengths.(0) in
|
||||
let result = Varvara.File.file_read ram 0 addr len in
|
||||
Varvara.File.file_success dev 0xa2 result
|
||||
| 0xae ->
|
||||
let addr = Bytes.get_uint16_be dev 0xae in
|
||||
let len = Varvara.File.file_lengths.(0) in
|
||||
let append = Bytes.get_uint8 dev 0xa7 in
|
||||
let result = Varvara.File.file_write ram 0 addr len append in
|
||||
Varvara.File.file_success dev 0xa2 result
|
||||
| 0xba -> Varvara.File.file_lengths.(1) <- Bytes.get_uint16_be dev 0xba
|
||||
| 0xb4 ->
|
||||
let addr = Bytes.get_uint16_be dev 0xb4 in
|
||||
let len = Varvara.File.file_lengths.(1) in
|
||||
let result = Varvara.File.file_stat ram 1 addr len in
|
||||
Varvara.File.file_success dev 0xb2 result
|
||||
| 0xb6 ->
|
||||
let result = Varvara.File.file_delete 1 in
|
||||
Varvara.File.file_success dev 0xb2 (if result = 0 then 1 else 0)
|
||||
| 0xb8 ->
|
||||
let addr = Bytes.get_uint16_be dev 0xb8 in
|
||||
let result = Varvara.File.file_init ram 1 addr in
|
||||
Varvara.File.file_success dev 0xb2 result
|
||||
| 0xbc ->
|
||||
let addr = Bytes.get_uint16_be dev 0xbc in
|
||||
let len = Varvara.File.file_lengths.(1) in
|
||||
let result = Varvara.File.file_read ram 1 addr len in
|
||||
Varvara.File.file_success dev 0xb2 result
|
||||
| 0xbe ->
|
||||
let addr = Bytes.get_uint16_be dev 0xbe in
|
||||
let len = Varvara.File.file_lengths.(1) in
|
||||
let append = Bytes.get_uint8 dev 0xb7 in
|
||||
let result = Varvara.File.file_write ram 1 addr len append in
|
||||
Varvara.File.file_success dev 0xb2 result
|
||||
| _ -> ());
|
||||
continue k ()
|
||||
|
||||
let main () =
|
||||
if Array.length Sys.argv < 2 then (
|
||||
Fmt.epr "usage: uxnemu file.rom ...\n";
|
||||
Fmt.epr "usage: uxnemu file.rom\n";
|
||||
exit 1);
|
||||
|
||||
let code =
|
||||
|
|
@ -138,12 +179,42 @@ let main () =
|
|||
Out_channel.set_binary_mode stdout true;
|
||||
|
||||
let mach = Machine.create code in
|
||||
Bytes.set (Machine.dev mach) 0 '\x00';
|
||||
let dev = Machine.dev mach in
|
||||
|
||||
let has_args = Array.length Sys.argv > 2 in
|
||||
Bytes.set_uint8 dev 0x17 (if has_args then 1 else 0);
|
||||
|
||||
run mach 0x100;
|
||||
|
||||
if !console_vector <> 0 then begin
|
||||
let console_input ch ty =
|
||||
Bytes.set_uint8 dev 0x12 ch;
|
||||
Bytes.set_uint8 dev 0x17 ty;
|
||||
if Bytes.get_uint8 dev 0x0f = 0 then run mach !console_vector
|
||||
in
|
||||
if has_args then begin
|
||||
for i = 2 to Array.length Sys.argv - 1 do
|
||||
let arg = Sys.argv.(i) in
|
||||
String.iter
|
||||
(fun c ->
|
||||
if Bytes.get_uint8 dev 0x0f = 0 then console_input (Char.code c) 2)
|
||||
arg;
|
||||
if Bytes.get_uint8 dev 0x0f = 0 then
|
||||
console_input 0 (if i = Array.length Sys.argv - 1 then 4 else 3)
|
||||
done
|
||||
end;
|
||||
try
|
||||
while Bytes.get_uint8 dev 0x0f = 0 do
|
||||
match In_channel.input_byte stdin with
|
||||
| None -> raise Exit
|
||||
| Some c -> console_input c 1
|
||||
done
|
||||
with Exit -> console_input 0 4
|
||||
end;
|
||||
if debug then begin
|
||||
print_stack ~name:"wst" (Machine.wst mach);
|
||||
print_stack ~name:"rst" (Machine.rst mach)
|
||||
end;
|
||||
exit (Bytes.get_uint8 (Machine.dev mach) 0x0f land 0x7f)
|
||||
exit (Bytes.get_uint8 dev 0x0f land 0x7f)
|
||||
|
||||
let _ = main ()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue