Miroirs/hp-saturn
1
0
Fork 0
mirror of https://github.com/sxpert/hp-saturn synced 2025-01-31 19:57:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix more PC handling issues

Browse source
This commit is contained in:
Raphael Jacquot 2019-02-08 11:47:06 +01:00
parent 5559deab1d
commit 0f456bf0af
3 changed files with 21310 additions and 22927 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
opcodes/8[DF]xxxxx_GO.v
View file

@ -27,7 +27,7 @@ end
`DEC_GOVLNG_EXEC, `DEC_GOSBVL_EXEC: begin `DEC_GOVLNG_EXEC, `DEC_GOSBVL_EXEC: begin
// $display("GOSBVL new_PC %5h", new_PC); // $display("GOSBVL new_PC %5h", new_PC);
// $display("GOSBVL PC %5h", PC); // $display("GOSBVL PC %5h", PC);
if (decstate == `DEC_GOSBVL_EXEC) RSTK[rstk_ptr] <= new_PC; if (decstate == `DEC_GOSBVL_EXEC) RSTK[rstk_ptr] <= PC + 1;
new_PC <= jump_base; new_PC <= jump_base;
bus_load_pc <= 1; bus_load_pc <= 1;
execute_cycle <= 0; execute_cycle <= 0;

44217
saturn_core.json
View file

File diff suppressed because it is too large Load diff

18
saturn_core.v
View file

@ -95,6 +95,7 @@ reg [3:0] bus_nibble_in;
wire [3:0] bus_nibble_out; wire [3:0] bus_nibble_out;
wire bus_error; wire bus_error;
reg bus_load_pc; reg bus_load_pc;
reg en_bus_load_pc;
// should go away, the rom should work like any other bus module // should go away, the rom should work like any other bus module
reg rom_enable; reg rom_enable;
@ -102,6 +103,7 @@ reg rom_enable;
// internal registers // internal registers
reg [3:0] nibble; reg [3:0] nibble;
reg [19:0] new_PC; reg [19:0] new_PC;
reg [19:0] next_PC;
reg [19:0] inst_start_PC; reg [19:0] inst_start_PC;
reg [2:0] rstk_ptr; reg [2:0] rstk_ptr;
reg [19:0] jump_base; reg [19:0] jump_base;
@ -168,6 +170,7 @@ initial
decode_error = 0; decode_error = 0;
debug_stop = 0; debug_stop = 0;
bus_load_pc = 1; bus_load_pc = 1;
en_bus_load_pc = 1;
read_next_pc = 1; read_next_pc = 1;
execute_cycle = 0; execute_cycle = 0;
inc_pc = 0; inc_pc = 0;
@ -175,6 +178,7 @@ initial
hex_dec = `MODE_HEX; hex_dec = `MODE_HEX;
PC = 0; PC = 0;
new_PC = 0; new_PC = 0;
next_PC = 0;
inst_start_PC = 0; inst_start_PC = 0;
rstk_ptr = 7; rstk_ptr = 7;
@ -182,6 +186,8 @@ initial
// reset, clk, clk2, clk3, ph0, ph1, ph2, ph3, cycle_ctr, en_bus_clk, strobe, bus_load_pc, bus_nibble_in, bus_nibble_out, nibble); // reset, clk, clk2, clk3, ph0, ph1, ph2, ph3, cycle_ctr, en_bus_clk, strobe, bus_load_pc, bus_nibble_in, bus_nibble_out, nibble);
// $monitor("CTR %d | EBCLK %b| B_STRB %b | EDCLK %b | D_STRB %b | BLPC %b | bnbi %b | bnbo %b | nb %b ", // $monitor("CTR %d | EBCLK %b| B_STRB %b | EDCLK %b | D_STRB %b | BLPC %b | bnbi %b | bnbo %b | nb %b ",
// cycle_ctr, en_bus_clk, bus_strobe, en_dec_clk, dec_strobe, bus_load_pc, bus_nibble_in, bus_nibble_out, nibble); // cycle_ctr, en_bus_clk, bus_strobe, en_dec_clk, dec_strobe, bus_load_pc, bus_nibble_in, bus_nibble_out, nibble);
// $monitor("BLPC %b | EBLPC %b",
// bus_load_pc, en_bus_load_pc);
end end
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -219,11 +225,13 @@ begin
if (clk3) begin if (clk3) begin
en_dec_clk <= 0; en_dec_clk <= 0;
cycle_ctr <= cycle_ctr + 1; cycle_ctr <= cycle_ctr + 1;
if (bus_load_pc) begin if (bus_load_pc&en_bus_load_pc) begin
bus_command <= `BUSCMD_LOAD_PC; bus_command <= `BUSCMD_LOAD_PC;
bus_address <= new_PC; bus_address <= new_PC;
bus_load_pc <= 0; next_PC <= new_PC;
PC <= new_PC;
en_bus_clk <= 1; en_bus_clk <= 1;
en_bus_load_pc <= 0;
//$display(">>>> PC load newPC %5h", new_PC); //$display(">>>> PC load newPC %5h", new_PC);
end else begin end else begin
if (read_next_pc&~execute_cycle) begin if (read_next_pc&~execute_cycle) begin
@ -231,8 +239,9 @@ begin
bus_command <= `BUSCMD_PC_READ; bus_command <= `BUSCMD_PC_READ;
read_nibble <= 1; read_nibble <= 1;
en_bus_clk <= 1; en_bus_clk <= 1;
PC <= new_PC; PC <= next_PC;
inc_pc <= 1; inc_pc <= 1;
en_bus_load_pc <= 1;
end else begin end else begin
//$display(">>>> PC no change %5h", PC); //$display(">>>> PC no change %5h", PC);
$display("BUS NOT READING, STILL CLOCKING"); $display("BUS NOT READING, STILL CLOCKING");
@ -251,7 +260,7 @@ begin
en_dec_clk <= 1; // PC does not change en_dec_clk <= 1; // PC does not change
end end
if (inc_pc) begin if (inc_pc) begin
new_PC <= PC + 1; next_PC <= PC + 1;
inc_pc <= 0; inc_pc <= 0;
//$display(">>>> PC inc to %5h", PC + 20'h1); //$display(">>>> PC inc to %5h", PC + 20'h1);
end end
@ -286,6 +295,7 @@ end
`include "decstates.v" `include "decstates.v"
always @(posedge dec_strobe) begin always @(posedge dec_strobe) begin
bus_load_pc <= 0;
`ifdef SIM `ifdef SIM
if (decstate == `DEC_START) begin if (decstate == `DEC_START) begin
// display registers // display registers