1.1 --- a/config/pm/Pygar/audio_core/audio_core_exe.apm	Tue May 04 22:32:52 2010 -0400
     1.2 +++ b/config/pm/Pygar/audio_core/audio_core_exe.apm	Wed May 05 01:09:09 2010 -0400
     1.3 @@ -88,6 +88,7 @@
     1.4  funcp_base_types=Functional Partition Base Types
     1.5  audio_pipe_types=Simple Audio Processor Control Types
     1.6  path_types=Audio Path Types
     1.7 +mixer=Mixer
     1.8  
     1.9  [Audio Processor Core/Requires]
    1.10  processor_library=External Trace Processor Library
    1.11 @@ -110,3 +111,6 @@
    1.12  
    1.13  [Audio Path Types]
    1.14  File=modules/bluespec/Pygar/core/path_types.awb
    1.15 +
    1.16 +[Mixer]
    1.17 +File=modules/bluespec/Pygar/core/mixer.awb

     2.1 --- a/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Tue May 04 22:32:52 2010 -0400
     2.2 +++ b/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Wed May 05 01:09:09 2010 -0400
     2.3 @@ -130,7 +130,6 @@
     2.4       count++;
     2.5       sem_wait(&throttle);
     2.6      
     2.7 -     printf("sending file\n");
     2.8      //rlm: two files.
     2.9      // clientStub->SendUnprocessedStream( Data,(UINT32)sample);
    2.10       clientStub->SendUnprocessedStream((UINT32)channel0 , Data,(UINT32)sample);

     3.1 --- a/modules/bluespec/Pygar/core/Processor.bsv	Tue May 04 22:32:52 2010 -0400
     3.2 +++ b/modules/bluespec/Pygar/core/Processor.bsv	Wed May 05 01:09:09 2010 -0400
     3.3 @@ -372,6 +372,7 @@
     3.4  	    end
     3.5  	 tagged LUI   .it : 
     3.6  	    begin
     3.7 +	       $display("PROCESSOR Instr LUI\n");
     3.8  	       Bit#(32) zext_it_imm = zext(it.imm);
     3.9  	       wbQ.enq(tagged WB_ALU {dest: it.rdst, data:(zext_it_imm << 32'd16) });
    3.10  	    end
    3.11 @@ -456,13 +457,15 @@
    3.12  	end
    3.13        
    3.14        tagged JR    .it : 
    3.15 -        begin 
    3.16 +        begin
    3.17 +	   $display("PROCESSOR inst JR\n");  
    3.18  	   newPC = rf.rd1(it.rsrc);
    3.19  	   branchTaken = True;
    3.20  	end
    3.21  
    3.22        tagged JAL   .it : 
    3.23         begin
    3.24 +	  $display("PROCESSOR inst JAL\n");  
    3.25            wbQ.enq(tagged WB_ALU {dest:31, data:pc_plus4 });
    3.26            newPC = { pc_plus4[31:28], it.target, 2'b0 };		  
    3.27  	  branchTaken = True;
    3.28 @@ -580,13 +583,13 @@
    3.29       cp0_audioEOF <= True;
    3.30       inAudioFifo.deq;
    3.31    endrule
    3.32 -
    3.33 +/*
    3.34    rule sendAudioEnd (cp0_progComp);
    3.35       $display (" PROCESSOR Says Program Complete ");
    3.36       outAudioFifo.enq(tagged EndOfFile);
    3.37       cp0_progComp <= False;  //only send one.  And functions to reset
    3.38    endrule
    3.39 -
    3.40 +*/
    3.41     
    3.42    //-----------------------------------------------------------
    3.43    // Methods

     4.1 --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Tue May 04 22:32:52 2010 -0400
     4.2 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed May 05 01:09:09 2010 -0400
     4.3 @@ -37,6 +37,7 @@
     4.4  `include "asim/provides/audio_pipe_types.bsh"  //provides Audio Pipeline interface
     4.5  `include "asim/provides/path_types.bsh"
     4.6  `include "asim/provides/core.bsh"
     4.7 +//`include "asim/provides/mixer.bsh"
     4.8  `include "asim/provides/processor_library.bsh"
     4.9  `include "asim/provides/fpga_components.bsh"
    4.10  `include "asim/provides/scratchpad_memory.bsh"
    4.11 @@ -78,11 +79,13 @@
    4.12      let coreReq <- core.mmem_client.request.get;
    4.13      case (coreReq) matches 
    4.14        tagged LoadReq .load: begin
    4.15 +	                      $display("PIPE Load Addr Req %x", load.addr); 
    4.16                                //Allocate ROB space
    4.17                                memory.readReq(truncate(load.addr>>2));
    4.18                                tags.enq(load.tag);
    4.19                              end
    4.20 -      tagged StoreReq .store: begin
    4.21 +       tagged StoreReq .store: begin
    4.22 +	  	              $display("PIPE Write Addr Req %x", store.addr); 
    4.23  	                      memory.write(truncate(store.addr>>2),store.data);
    4.24                                end
    4.25      endcase
    4.26 @@ -93,6 +96,7 @@
    4.27      tags.deq;
    4.28      core.mmem_client.response.put(tagged LoadResp {data:memResp,
    4.29                                                     tag: tags.first});
    4.30 +     	                $display("PIPE Receive MemReq %x", memResp); 
    4.31    endrule
    4.32  
    4.33     rule feedOutput;

     5.1 --- a/modules/bluespec/Pygar/core/audio_core_pipe.awb	Tue May 04 22:32:52 2010 -0400
     5.2 +++ b/modules/bluespec/Pygar/core/audio_core_pipe.awb	Wed May 05 01:09:09 2010 -0400
     5.3 @@ -6,11 +6,11 @@
     5.4  %requires audio_pipe_types
     5.5  %requires path_types
     5.6  %requires core
     5.7 +%requires mixer
     5.8  %requires funcp_simulated_memory
     5.9  %requires funcp_base_types
    5.10  %requires hasim_common
    5.11  
    5.12 -
    5.13  %attributes 6_375
    5.14  
    5.15  %sources -t BSV	 -v PUBLIC audioCorePipeline.bsv
    5.16 @@ -19,7 +19,7 @@
    5.17  %sources -t CPP  -v PRIVATE AudioCoreRRR.cpp
    5.18  %sources -t H    -v PUBLIC AudioCoreRRR.h
    5.19  %sources -t RRR  -v PUBLIC AudioCoreRRR.rrr
    5.20 -%sources -t DICT -v PUBLIC AudioCore.dic
    5.21 +%sources -t DICT -v PUBLIC ProcessorSystem.dic
    5.22  
    5.23  %sources -t CPP  -v PRIVATE SndfileWavUtil.cpp
    5.24  %sources -t H	 -v PUBLIC SndfileWavUtil.h