Merge nyus:/storage/git/firearm
authorJoshua Wise <joshua@rebirth.joshuawise.com>
Wed, 7 Jan 2009 08:08:46 +0000 (03:08 -0500)
committerJoshua Wise <joshua@rebirth.joshuawise.com>
Wed, 7 Jan 2009 08:08:46 +0000 (03:08 -0500)
Conflicts:

Memory.v

Memory.v

index 221cc77..658e7d2 100644 (file)
--- a/Memory.v
+++ b/Memory.v
@@ -16,6 +16,11 @@ module Memory(
        output reg [3:0] st_read,
        input [31:0] st_data,
        
+       /* Coprocessor interface */
+       output reg cp_req,
+       input cp_ack,
+       input cp_busy,
+       
        /* stage inputs */
        input inbubble,
        input [31:0] pc,
@@ -95,6 +100,7 @@ module Memory(
                outstall = 1'b0;
                next_regs = 16'b0;
                next_started = started;
+               cp_req = 1'b0;
                offset = prev_offset;
                next_outcpsr = started ? out_cpsr : cpsr;
 
This page took 0.021761 seconds and 4 git commands to generate.