summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/asmpars.mly37
-rw-r--r--cpu/Makefile2
-rw-r--r--cpu/cpu.ml15
-rw-r--r--cpu/prog_test1.rom36
-rw-r--r--monitor/disp.c21
-rw-r--r--monitor/mon.c1
-rw-r--r--monitor/mon.h1
-rw-r--r--sched/Makefile2
-rw-r--r--sched/_tags3
9 files changed, 86 insertions, 32 deletions
diff --git a/asm/asmpars.mly b/asm/asmpars.mly
index 46ca7a7..8dbf665 100644
--- a/asm/asmpars.mly
+++ b/asm/asmpars.mly
@@ -21,17 +21,16 @@
let lbls2 = ref (Imap.empty)
- let li u r = function
- | Imm i ->
- let c =
- if u then i < 1 lsl 8
- else i >= -(1 lsl 7) && i < 1 lsl 7 in
- if c then (add pc 2; [Lilz (r,Imm i)])
- else (add pc 4; [Lilz (r,Imm (i land 0x00FF)); Liu (r,Imm ((i land 0xFF00) lsr 8))])
- | Lab id ->
- add pc 4; [Lilz (r,Lab id); Liu (r,Lab id)]
+ let li u r = function
+ | Imm i ->
+ let c =
+ if u then i < 1 lsl 8
+ else i >= -(1 lsl 7) && i < 1 lsl 7 in
+ if c then (add pc 2; [Lilz (r,Imm i)])
+ else (add pc 4; [Lilz (r,Imm (i land 0x00FF)); Liu (r,Imm ((i land 0xFF00) lsr 8))])
+ | Lab id ->
+ add pc 4; [Lilz (r,Lab id); Liu (r,Lab id)]
-
let explode s = (* string -> char list *)
let rec exp i l =
if i < 0 then l else exp (i - 1) (s.[i] :: l) in
@@ -60,20 +59,20 @@ data:
DATA d=datas* { d }
datas:
- | labeld d=datas { d }
- | BYTE bs=int* { List.map (fun i -> add ram 1; i,false) bs }
- | WORD bs=int* { List.map (fun i -> add ram 2; i,true) bs }
-
+ | labeld d=datas { d }
+ | BYTE bs=int* { List.map (fun i -> add ram 1; i,false) bs }
+ | WORD bs=int* { List.map (fun i -> add ram 2; i,true) bs }
+
labeli:
- id=ID COLON { lbls2 := Imap.add id (!pc,true) !lbls2 }
+ id=ID COLON { lbls2 := Imap.add id (!pc,true) !lbls2 }
labeld:
- id=ID COLON { lbls2 := Imap.add id (!ram,false) !lbls2 }
+ id=ID COLON { lbls2 := Imap.add id (!ram,false) !lbls2 }
instr:
- | labeli i=instr { i }
- | i=_instr { i }
-
+ | labeli i=instr { i }
+ | i=_instr { i }
+
_instr:
| o=ROP r1=REG r2=REG r3=REG { add pc 2; [R (o,r1,r2,r3)] }
| o=RIOP r1=REG r2=REG imm=imm
diff --git a/cpu/Makefile b/cpu/Makefile
index 898b007..5efa691 100644
--- a/cpu/Makefile
+++ b/cpu/Makefile
@@ -8,7 +8,7 @@ SIM=../csim/csim
MON=../monitor/mon
all: _build/cpu_opt.dumb
- $(MON) $(SIM) -rom ROM0 prog_rom0.rom $<
+ $(MON) $(SIM) -rom ROM0 prog_test1.rom $<
%.sim: _build/%.dumb
$(SIM) -n 12 $<
diff --git a/cpu/cpu.ml b/cpu/cpu.ml
index b7e394b..1d1eea8 100644
--- a/cpu/cpu.ml
+++ b/cpu/cpu.ml
@@ -6,6 +6,8 @@ let ser_in_busy, save_ser_in_busy = loop 1
let dbg_ra, save_dbg_ra = loop 16
let dbg_read_data, save_dbg_read_data = loop 8
+let dbg_wa, save_dbg_wa = loop 16
+let dbg_write_data, save_dbg_write_data = loop 8
let cpu_ram ra we wa d =
(* Ram chip has word size = 8 bits and address size = 16 bits
@@ -61,6 +63,8 @@ let cpu_ram ra we wa d =
save_dbg_ra ra ^.
save_dbg_read_data read_data ^.
+ save_dbg_wa wa ^.
+ save_dbg_write_data d ^.
read_data
@@ -183,6 +187,7 @@ let rl, rh, i, ex, exf, pc =
let instr_j = exec ^& eq_c 5 i_i 0b01000 in
let next_pc = mux instr_j next_pc (nadder 16 pc (sign_extend 11 16 i_jd)) in
(* instruction : jal *)
+ let link_pc = next_pc in
let instr_jal = exec ^& eq_c 5 i_i 0b01001 in
let next_pc = mux instr_jal next_pc (nadder 16 pc (sign_extend 11 16 i_jd)) in
let instr_jalxx = instr_jal in
@@ -196,7 +201,7 @@ let rl, rh, i, ex, exf, pc =
let next_pc = mux cond_jxxr next_pc v_r in
(* prologue for jal/jalr *)
let wr = mux instr_jalxx wr (const "011") in
- let rwd = mux instr_jalxx rwd next_pc in
+ let rwd = mux instr_jalxx rwd link_pc in
(* instruction : lra *)
let instr_lra = exec ^& eq_c 5 i_i 0b01100 in
@@ -287,11 +292,13 @@ let p =
[
"read_ilow", 1, rl;
"read_ihi", 1, rh;
- "exec_instr", 1, ex;
- "exec_finished", 1, exf;
- "instruction", 16, i;
+ "ex_instr", 1, ex;
+ "ex_finish", 1, exf;
+ "i", 16, i;
"ra", 16, dbg_ra;
"read_data", 8, dbg_read_data;
+ "wa", 16, dbg_wa;
+ "write_data", 8, dbg_write_data;
"pc", 16, pc;
"r0_Z", 16, r0;
"r1_A", 16, r1;
diff --git a/cpu/prog_test1.rom b/cpu/prog_test1.rom
new file mode 100644
index 0000000..0d352b7
--- /dev/null
+++ b/cpu/prog_test1.rom
@@ -0,0 +1,36 @@
+58 8
+11111111 11111011 # liuz SP 255
+00000000 00100000 # add D Z Z
+ # init:
+00000010 01011011 # liuz B 64
+00000010 01000001 # lw B 0(B)
+00100000 10110011 # lilz E init
+00000000 10101011 # liu E init
+01000010 10101010 # jer E B Z
+00010001 00100000 # add D D B
+01111111 11101100 # incri SP -2
+00000111 00110001 # sw D 0(SP)
+00101100 10010011 # lilz A msgtick
+00000000 10001011 # liu A msgtick
+00010000 00010010 # jal ser_out_msg
+00000111 00100001 # lw D 0(SP)
+01000000 11101100 # incri SP 2
+01100111 11100010 # j init
+ # ser_out_msg:
+10000010 11011011 # liuz C 65
+01000000 11000011 # lil C 2
+ # ser_out_msg_loop:
+00000100 01001001 # lb B 0(A)
+01001100 10110011 # lilz E ser_out_msg_ret
+00000000 10101011 # liu E ser_out_msg_ret
+01000010 10101010 # jer E B Z
+00000110 01011001 # sb B 0(C)
+10000000 10001100 # incri A 1
+00101111 11100010 # j ser_out_msg_loop
+ # ser_out_msg_ret:
+00000000 01101010 # jr RA
+ # msgtick:
+00101010 10010110 # bytes 84 105
+11000110 11010110 # bytes 99 107
+10000100 00000000 # bytes 33 0
+
diff --git a/monitor/disp.c b/monitor/disp.c
index 992c712..84dd941 100644
--- a/monitor/disp.c
+++ b/monitor/disp.c
@@ -86,19 +86,18 @@ void disp_display(t_mon *mon) {
wprintw(wpstatus, "\nInputs:\n");
for (i = 0; i < mon->n_inputs; i++) {
- wprintw(wpstatus, " %d. %s%s\t%s (%d)\t%s\n",
+ wprintw(wpstatus, "%s %d. %s (%d)\t%s\n",
+ (i == mon->ticker_input ? "T" : (i == mon->ser_in_in ? ">" : " ")),
i,
- (i == mon->ticker_input ? "T" : ""),
- (i == mon->ser_in_in ? ">" : ""),
mon->inputs[i].name, mon->inputs[i].size, mon->inputs[i].value);
}
if (mon->n_inputs == 0) wprintw(wpstatus, "\t(none)\n");
wprintw(wpstatus, "\nOutputs:\n");
for (i = 0; i < mon->n_outputs; i++) {
- wprintw(wpstatus, " %d. %s%s\t%s\t%s\t%ld\n", i,
- (i == mon->ser_out ? "<" : ""),
- (i == mon->ser_in_busy_out ? "!" : ""),
+ wprintw(wpstatus, "%s %d. %s\t%s %ld\n",
+ (i == mon->ser_out ? "<" : (i == mon->ser_in_busy_out ? "!" : " ")),
+ i,
mon->outputs[i].name, mon->outputs[i].v_bin, mon->outputs[i].v_int);
}
if (mon->n_outputs == 0) wprintw(wpstatus, "\t(none)\n");
@@ -147,4 +146,14 @@ void disp_display(t_mon *mon) {
}
+void disp_display_ser(t_mon *mon) {
+ if (mon->ser_out_buf != 0) {
+ wprintw(wpoutput, "%c", mon->ser_out_buf);
+ wrefresh(wpoutput);
+ mon->ser_out_buf = 0;
+
+ wmove(wcmdline, 0, cmd_pos + 2);
+ wrefresh(wcmdline);
+ }
+}
diff --git a/monitor/mon.c b/monitor/mon.c
index 19055c7..baef98b 100644
--- a/monitor/mon.c
+++ b/monitor/mon.c
@@ -285,4 +285,5 @@ void mon_step(t_mon *mon) {
}
mon->step++;
+ disp_display_ser(mon);
}
diff --git a/monitor/mon.h b/monitor/mon.h
index 0040eda..32d60c4 100644
--- a/monitor/mon.h
+++ b/monitor/mon.h
@@ -61,6 +61,7 @@ typedef struct {
void disp_init();
void disp_display(t_mon *mon);
+void disp_display_ser(t_mon *mon);
void disp_finish();
void handle_kbd(t_mon *mon);
diff --git a/sched/Makefile b/sched/Makefile
index 4d36b96..35d6ddc 100644
--- a/sched/Makefile
+++ b/sched/Makefile
@@ -3,7 +3,7 @@ IN=graph.ml main.ml netlist_ast.ml netlist_dumb.ml netlist_lexer.mll netlist.ml
all: sched
sched: $(IN)
- ocamlbuild -libs unix main.native
+ ocamlbuild main.native
mv main.native sched
clean:
diff --git a/sched/_tags b/sched/_tags
index 503ce62..007e22c 100644
--- a/sched/_tags
+++ b/sched/_tags
@@ -1,3 +1,4 @@
true: use_menhir
<*.ml>: debug
-<*.byte>: use_unix, debug \ No newline at end of file
+<*.byte>: use_unix, debug
+<*.native>: use_unix
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 12:34:32 +0000