Branch_20240013
same...
This commit is contained in:
1 parent
da8a0af990
commit
4b22017c93
1 file changed
+89
-17
+89
-17
@@ -6,7 +6,7 @@
|
|||||||
//
|
//
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// CPU section copyrighted by John Kent
|
// CPU section copyrighted by John Kent or Greg Miller dependant on selection
|
||||||
//
|
//
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
@@ -254,7 +254,7 @@ reg RESET_N;
|
|||||||
reg [6:0] CPU_RESET_SM;
|
reg [6:0] CPU_RESET_SM;
|
||||||
reg CPU_RESET;
|
reg CPU_RESET;
|
||||||
wire RESET_INS;
|
wire RESET_INS;
|
||||||
reg MUGS;
|
reg MUGS = 0;
|
||||||
wire RESET;
|
wire RESET;
|
||||||
wire RESET_P;
|
wire RESET_P;
|
||||||
wire [15:0] ADDRESS;
|
wire [15:0] ADDRESS;
|
||||||
@@ -737,10 +737,11 @@ assign RAM_CS = (ADDRESS[15:0]== 16'hFFE8) ? 1'b1: // GART 1
|
|||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* ROM signals
|
* ROM signals
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
// ROM_SEL is 1 when the system is accessing any cartridge "ROM" meaning the
|
// ROM_SEL is 1 when the system is accessing the internal "ROM"
|
||||||
|
// CART_SEL is 1 when the system is accessing any cartridge "ROM" meaning the
|
||||||
// 4 slots of the MPI, this is:
|
// 4 slots of the MPI, this is:
|
||||||
// Slot 1 Orchestra-90C
|
// Slot 1 Not Used
|
||||||
// Slot 2 Alternate Disk Controller ROM
|
// Slot 2 Disk Controller ROM
|
||||||
// Slot 3 Cart slot
|
// Slot 3 Cart slot
|
||||||
// Slot 4 Disk Controller ROM
|
// Slot 4 Disk Controller ROM
|
||||||
|
|
||||||
@@ -767,7 +768,7 @@ assign FLASH_ADDRESS = ENA_DSK ? {9'b000000100, ADDRESS[12:0]
|
|||||||
ENA_ORCC ? {9'b000000101, ADDRESS[12:0]}: //8K Orchestra 8K 90CC Slot 1
|
ENA_ORCC ? {9'b000000101, ADDRESS[12:0]}: //8K Orchestra 8K 90CC Slot 1
|
||||||
({ENA_PAK, ROM[1]} == 2'b10) ? {5'b00000,ROM_BANK, ADDRESS[13:0]}: //16K External R CART ROM
|
({ENA_PAK, ROM[1]} == 2'b10) ? {5'b00000,ROM_BANK, ADDRESS[13:0]}: //16K External R CART ROM
|
||||||
({ENA_PAK, ROM} == 3'b111) ? {4'b0000,ROM_BANK, ~ADDRESS[14], ADDRESS[13:0]}: //32K External R CART ROM
|
({ENA_PAK, ROM} == 3'b111) ? {4'b0000,ROM_BANK, ~ADDRESS[14], ADDRESS[13:0]}: //32K External R CART ROM
|
||||||
{7'b0000000,ADDRESS[14:0]};
|
{7'b0000000,ADDRESS[14:0]}; //32K Internal COCO3 ROM
|
||||||
|
|
||||||
|
|
||||||
//ROM
|
//ROM
|
||||||
@@ -841,12 +842,15 @@ assign ENA_PAK = ({CART_SEL, MPI_CTS} == 3'b110) ? 1'b1: // ROM SLOT 3
|
|||||||
1'b0;
|
1'b0;
|
||||||
assign ENA_DSK = ({CART_SEL, MPI_CTS} == 3'b111) ? 1'b1: // Disk C000-DFFF Slot 4
|
assign ENA_DSK = ({CART_SEL, MPI_CTS} == 3'b111) ? 1'b1: // Disk C000-DFFF Slot 4
|
||||||
1'b0;
|
1'b0;
|
||||||
assign HDD_EN = ({MPI_SCS, ADDRESS[15:4]} == 14'b11111111110100) ? 1'b1: // FF40-FF4F with MPI switch = 4
|
assign HDD_EN = ({MPI_SCS, ADDRESS[15:5]} == 13'b1111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 4
|
||||||
1'b0;
|
1'b0;
|
||||||
assign SDC_EN_CS = ({MPI_SCS, ADDRESS[15:4]} == 14'b01111111110100) ? 1'b1: // FF40-FF4F with MPI switch = 2
|
|
||||||
|
assign SDC_EN_CS = ({MPI_SCS, ADDRESS[15:5]} == 13'b0111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 2
|
||||||
1'b0;
|
1'b0;
|
||||||
assign RS232_EN = (ADDRESS[15:2] == 14'b11111111011010) ? 1'b1: //FF68-FF6B
|
|
||||||
|
assign RS232_EN = ({MPI_SCS, ADDRESS[15:2]} == 16'b0011111111011010) ? 1'b1: //FF68-FF6B - Now in slot 1
|
||||||
1'b0;
|
1'b0;
|
||||||
|
|
||||||
assign SLOT3_HW = ({SWITCH[2:1], ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F Ensure this only appears in slot 3 PHYSICALLY
|
assign SLOT3_HW = ({SWITCH[2:1], ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F Ensure this only appears in slot 3 PHYSICALLY
|
||||||
1'b0;
|
1'b0;
|
||||||
|
|
||||||
@@ -877,8 +881,8 @@ end
|
|||||||
|
|
||||||
|
|
||||||
`ifdef Config_Debug
|
`ifdef Config_Debug
|
||||||
wire Config_FLAG = `Config_Debug_FLAG;
|
wire[7:0] Config_FLAG = `Config_Debug_FLAG;
|
||||||
wire Config_Debug_Value = `Config_Debug_Value;
|
wire[7:0] Config_Debug_Value = `Config_Debug_Value;
|
||||||
`endif
|
`endif
|
||||||
|
|
||||||
assign DATA_IN =
|
assign DATA_IN =
|
||||||
@@ -1137,8 +1141,11 @@ wire cache_hit /* synthesis preserve */;
|
|||||||
assign cache_hit = (sdram_cpu_addr[24:1] == sdram_cpu_addr_L[24:1]);
|
assign cache_hit = (sdram_cpu_addr[24:1] == sdram_cpu_addr_L[24:1]);
|
||||||
//assign cache_hit = 1'b0;
|
//assign cache_hit = 1'b0;
|
||||||
|
|
||||||
//BANKS
|
// Master timing loop
|
||||||
// CPU clock / SRAM Signals for old SRAM
|
|
||||||
|
// This sig is only used for the cycle accurate 09
|
||||||
|
reg cpu_cycle_ena;
|
||||||
|
|
||||||
always @(negedge clk_sys or negedge RESET_N)
|
always @(negedge clk_sys or negedge RESET_N)
|
||||||
begin
|
begin
|
||||||
if(!RESET_N)
|
if(!RESET_N)
|
||||||
@@ -1161,12 +1168,14 @@ begin
|
|||||||
GART_WR <= 1'b0;
|
GART_WR <= 1'b0;
|
||||||
GART_RD <= 1'b0;
|
GART_RD <= 1'b0;
|
||||||
AMW_WR <= 1'b0;
|
AMW_WR <= 1'b0;
|
||||||
|
cpu_cycle_ena <= 1'b0;
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
clear_data_ready <= 1'b0;
|
clear_data_ready <= 1'b0;
|
||||||
sdram_BE_0 <= 1'b0;
|
sdram_BE_0 <= 1'b0;
|
||||||
sdram_BE_1 <= 1'b0;
|
sdram_BE_1 <= 1'b0;
|
||||||
|
cpu_cycle_ena <= 1'b0; // This is only a single clock per cpu cycle
|
||||||
|
|
||||||
// If we are in hold were done @ data_ready.
|
// If we are in hold were done @ data_ready.
|
||||||
if (hold)
|
if (hold)
|
||||||
@@ -1176,6 +1185,7 @@ begin
|
|||||||
// Hold states are done - kill hold and set end hold to drive data
|
// Hold states are done - kill hold and set end hold to drive data
|
||||||
hold <= 1'b0;
|
hold <= 1'b0;
|
||||||
end_hold <= 1'b1;
|
end_hold <= 1'b1;
|
||||||
|
cpu_cycle_ena <= 1'b1; // Cycle at the end of a memory transaction
|
||||||
clear_data_ready <= 1'b1;
|
clear_data_ready <= 1'b1;
|
||||||
hold_data_L <= hold_data;
|
hold_data_L <= hold_data;
|
||||||
sdram_BE_0 <= RAM0_BE0_L;
|
sdram_BE_0 <= RAM0_BE0_L;
|
||||||
@@ -1210,10 +1220,14 @@ begin
|
|||||||
begin
|
begin
|
||||||
cpu_ena <= 1'b1;
|
cpu_ena <= 1'b1;
|
||||||
|
|
||||||
|
cpu_cycle_ena <= 1'b1; // Default cycle
|
||||||
|
|
||||||
if (AMW_EN) // Automated Memory Write ?
|
if (AMW_EN) // Automated Memory Write ?
|
||||||
begin
|
begin
|
||||||
AMW_WR <= 1'b1;
|
AMW_WR <= 1'b1;
|
||||||
cpu_ena <= 1'b0; // Kill cpu enable
|
cpu_ena <= 1'b0; // Kill cpu enable
|
||||||
|
cpu_cycle_ena <= 1'b0; // Kill (defer) cycle based on memory transaction
|
||||||
|
|
||||||
|
|
||||||
// Start AMW cycle
|
// Start AMW cycle
|
||||||
RAM0_BE0_L <= !AMW_Adrs[0];
|
RAM0_BE0_L <= !AMW_Adrs[0];
|
||||||
@@ -1226,6 +1240,9 @@ begin
|
|||||||
else if (VMA & RAM_CS) // FFE8 / FFE9 is now in RAM_CS
|
else if (VMA & RAM_CS) // FFE8 / FFE9 is now in RAM_CS
|
||||||
begin
|
begin
|
||||||
// sdram memory cycle
|
// sdram memory cycle
|
||||||
|
`ifdef CoCo3_disable_GART_in_GIMEX
|
||||||
|
if (0);
|
||||||
|
`else
|
||||||
if ((ADDRESS[15:0] == 16'hFFE8) | (ADDRESS[15:0] == 16'hFFE9)) // GART
|
if ((ADDRESS[15:0] == 16'hFFE8) | (ADDRESS[15:0] == 16'hFFE9)) // GART
|
||||||
begin
|
begin
|
||||||
if (~RW_N)
|
if (~RW_N)
|
||||||
@@ -1241,11 +1258,14 @@ begin
|
|||||||
GART_RD <= 1'b1;
|
GART_RD <= 1'b1;
|
||||||
end
|
end
|
||||||
hold <= 1'b1;
|
hold <= 1'b1;
|
||||||
|
cpu_cycle_ena <= 1'b0; // Kill (defer) cycle based on memory transaction
|
||||||
sdram_cpu_req <= 1'b1;
|
sdram_cpu_req <= 1'b1;
|
||||||
sdram_cpu_rnw <= RW_N;
|
sdram_cpu_rnw <= RW_N;
|
||||||
last_write <= 1'b1; // Kill cache hit on any access after GART
|
last_write <= 1'b1; // Kill cache hit on any access after GART
|
||||||
end
|
end
|
||||||
|
`endif
|
||||||
else // Normal CPU cycle
|
else // Normal CPU cycle
|
||||||
|
begin
|
||||||
// get which byte
|
// get which byte
|
||||||
RAM0_BE0_L <= !ADDRESS[0];
|
RAM0_BE0_L <= !ADDRESS[0];
|
||||||
RAM0_BE1_L <= ADDRESS[0];
|
RAM0_BE1_L <= ADDRESS[0];
|
||||||
@@ -1255,11 +1275,13 @@ begin
|
|||||||
end_hold <= 1'b1; // If so then end the cpu_ena cycle with the updated byte enable
|
end_hold <= 1'b1; // If so then end the cpu_ena cycle with the updated byte enable
|
||||||
sdram_BE_0 <= !ADDRESS[0];
|
sdram_BE_0 <= !ADDRESS[0];
|
||||||
sdram_BE_1 <= ADDRESS[0];
|
sdram_BE_1 <= ADDRESS[0];
|
||||||
|
// Allow cpu_cycke_ena previously set based upon cache tansaction
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
sdram_cpu_addr_L <= sdram_cpu_addr; // Else set hold and start a sdram cycle
|
sdram_cpu_addr_L <= sdram_cpu_addr; // Else set hold and start a sdram cycle
|
||||||
hold <= 1'b1;
|
hold <= 1'b1;
|
||||||
|
cpu_cycle_ena <= 1'b0; // Kill (defer) cycle based on memory transaction
|
||||||
sdram_cpu_req <= 1'b1;
|
sdram_cpu_req <= 1'b1;
|
||||||
sdram_cpu_rnw <= RW_N;
|
sdram_cpu_rnw <= RW_N;
|
||||||
last_write <= ~RW_N;
|
last_write <= ~RW_N;
|
||||||
@@ -1267,7 +1289,7 @@ begin
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
6'h01:
|
6'h01:
|
||||||
begin
|
begin
|
||||||
PH_2_RAW <= 1'b0;
|
PH_2_RAW <= 1'b0;
|
||||||
@@ -1324,15 +1346,12 @@ begin
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
assign PH_2 = PH_2_RAW;
|
|
||||||
|
|
||||||
|
|
||||||
assign RESET_P = !BUTTON_N[3] // Button
|
assign RESET_P = !BUTTON_N[3] // Button
|
||||||
| RESET; // CTRL-ALT-DEL or CTRL-ALT-INS
|
| RESET; // CTRL-ALT-DEL or CTRL-ALT-INS
|
||||||
|
|
||||||
// Make sure all resets are enabled for a long enough time to allow voltages to settle
|
// Make sure all resets are enabled for a long enough time to allow voltages to settle
|
||||||
|
|
||||||
|
|
||||||
always @ (posedge clk_sys)
|
always @ (posedge clk_sys)
|
||||||
begin
|
begin
|
||||||
if (RESET)
|
if (RESET)
|
||||||
@@ -1369,6 +1388,55 @@ begin
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// CPU Selection
|
||||||
|
//
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
`ifdef CoCo3_CYC_ACC_6809
|
||||||
|
|
||||||
|
// Create VMA out of AVMA
|
||||||
|
wire AVMA;
|
||||||
|
|
||||||
|
always @(negedge clk_sys or negedge RESET_N)
|
||||||
|
begin
|
||||||
|
if(!RESET_N)
|
||||||
|
begin
|
||||||
|
VMA <= 1'b0;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
if (cpu_cycle_ena)
|
||||||
|
begin
|
||||||
|
VMA <= AVMA;
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
// Cycle Accurate CPU section copyrighted by Greg Miller
|
||||||
|
|
||||||
|
mc6809x GLBCPU09(
|
||||||
|
.D(DATA_IN),
|
||||||
|
.DOut(DATA_OUT),
|
||||||
|
.ADDR(ADDRESS),
|
||||||
|
.RnW(RW_N),
|
||||||
|
.MASTER(clk_sys),
|
||||||
|
.E(cpu_cycle_ena),
|
||||||
|
.Q(cpu_cycle_ena),
|
||||||
|
.nIRQ(CPU_IRQ_N),
|
||||||
|
.nFIRQ(CPU_FIRQ_N),
|
||||||
|
.nNMI(!NMI_09),
|
||||||
|
.AVMA(AVMA),
|
||||||
|
.nHALT(~HALT),
|
||||||
|
.nRESET(~CPU_RESET),
|
||||||
|
.nDMABREQ(1'b1)
|
||||||
|
);
|
||||||
|
|
||||||
|
assign PH_2 = cpu_cycle_ena;
|
||||||
|
|
||||||
|
`else
|
||||||
|
|
||||||
// CPU section copyrighted by John Kent
|
// CPU section copyrighted by John Kent
|
||||||
cpu09 GLBCPU09(
|
cpu09 GLBCPU09(
|
||||||
.clk(clk_sys),
|
.clk(clk_sys),
|
||||||
@@ -1386,6 +1454,10 @@ cpu09 GLBCPU09(
|
|||||||
.nmi(NMI_09)
|
.nmi(NMI_09)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
assign PH_2 = PH_2_RAW;
|
||||||
|
|
||||||
|
`endif
|
||||||
|
|
||||||
wire [8:0] BUFF_ADD_W;
|
wire [8:0] BUFF_ADD_W;
|
||||||
wire [8:0] BUFF_ADD;
|
wire [8:0] BUFF_ADD;
|
||||||
wire [15:0] BUFF_DATA_O;
|
wire [15:0] BUFF_DATA_O;
|
||||||
|
|||||||
Reference in new issue
Block a user