Merge branch 'main' of https://github.com/supleed2/AM04_CPU into main

This commit is contained in:
yhp19 2020-12-11 15:54:45 +08:00
commit 2c5b3ad604
7 changed files with 16 additions and 1 deletions

1
inputs/addiu.ref.txt Normal file
View file

@ -0,0 +1 @@
30

3
inputs/addiu.txt Normal file
View file

@ -0,0 +1,3 @@
3404000a
24820014
00000008

1
inputs/and.ref.txt Normal file
View file

@ -0,0 +1 @@
10

4
inputs/and.txt Normal file
View file

@ -0,0 +1,4 @@
3404000A
3405000F
00851024
00000008

1
inputs/andi.ref.txt Normal file
View file

@ -0,0 +1 @@
5

5
inputs/andi.txt Normal file
View file

@ -0,0 +1,5 @@
34040005
3082000f
00000008
00000000
00000000

View file

@ -45,7 +45,7 @@ module mips_cpu_memory(
//Synchronous write path //Synchronous write path
always_ff @(posedge clk) begin always_ff @(posedge clk) begin
$display("Instruction Read: %h", instr_readdata); //$display("Instruction Read: %h", instr_readdata);
//$display("RAM : INFO : data_read=%h, data_address = %h, mem=%h", data_read, data_address, memory[data_address]); //$display("RAM : INFO : data_read=%h, data_address = %h, mem=%h", data_read, data_address, memory[data_address]);
if (!data_read & data_write) begin //cannot read and write to memory in the same cycle if (!data_read & data_write) begin //cannot read and write to memory in the same cycle
if (instr_address != data_address) begin //cannot modify the instruction being read if (instr_address != data_address) begin //cannot modify the instruction being read