mirror of
				https://github.com/openhwgroup/cvw
				synced 2025-02-11 06:05:49 +00:00 
			
		
		
		
	The LSU is properly using FlushW rather than TrapM.
This commit is contained in:
		
							parent
							
								
									ce7e1073fa
								
							
						
					
					
						commit
						5a9e94048a
					
				@ -87,7 +87,7 @@ module hazard(
 | 
				
			|||||||
  // WFI terminates if any enabled interrupt is pending, even if global interrupts are disabled.  It could also terminate with TW trap
 | 
					  // WFI terminates if any enabled interrupt is pending, even if global interrupts are disabled.  It could also terminate with TW trap
 | 
				
			||||||
  assign StallMCause = ((wfiM) & (~TrapM & ~IntPendingM)); 
 | 
					  assign StallMCause = ((wfiM) & (~TrapM & ~IntPendingM)); 
 | 
				
			||||||
  //assign StallWCause = (IFUStallF | LSUStallM) & ~TrapM;
 | 
					  //assign StallWCause = (IFUStallF | LSUStallM) & ~TrapM;
 | 
				
			||||||
  assign StallWCause = (IFUStallF & ~(FlushDCause)) | (LSUStallM & ~TrapM); 
 | 
					  assign StallWCause = (IFUStallF & ~FlushDCause) | (LSUStallM & ~FlushWCause); 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Stall each stage for cause or if the next stage is stalled
 | 
					  // Stall each stage for cause or if the next stage is stalled
 | 
				
			||||||
  assign #1 StallF = StallFCause | StallD;
 | 
					  assign #1 StallF = StallFCause | StallD;
 | 
				
			||||||
 | 
				
			|||||||
@ -247,7 +247,7 @@ module wallypipelinedcore (
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  lsu lsu(
 | 
					  lsu lsu(
 | 
				
			||||||
     .clk, .reset, .StallM, .FlushM, .StallW,
 | 
					     .clk, .reset, .StallM, .FlushM, .StallW,
 | 
				
			||||||
  .FlushW(TrapM),
 | 
					  .FlushW,
 | 
				
			||||||
  // CPU interface
 | 
					  // CPU interface
 | 
				
			||||||
  .MemRWM, .Funct3M, .Funct7M(InstrM[31:25]),
 | 
					  .MemRWM, .Funct3M, .Funct7M(InstrM[31:25]),
 | 
				
			||||||
  .AtomicM,
 | 
					  .AtomicM,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user