Mercurial > pygar

changeset 21:cffe0829ce14 pygar svn.22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn r22] compiles with memclient commented out
author punk
date Wed, 28 Apr 2010 00:21:02 -0400
parents a346d9e5118a
children 0cfbb1e2de22
files modules/bluespec/Pygar/core/Processor.bsv modules/bluespec/Pygar/core/audioCore.bsv
diffstat 2 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/modules/bluespec/Pygar/core/Processor.bsv	Tue Apr 27 23:43:41 2010 -0400
     1.2 +++ b/modules/bluespec/Pygar/core/Processor.bsv	Wed Apr 28 00:21:02 2010 -0400
     1.3 @@ -599,13 +599,13 @@
     1.4    // Methods
     1.5  
     1.6    interface Client imem_client;
     1.7 -    interface Get request  = toGet(instReqQ);
     1.8 -    interface Put response = toPut(instRespQ);
     1.9 +    interface Get request  = fifoToGet(instReqQ);
    1.10 +    interface Put response = fifoToPut(instRespQ);
    1.11    endinterface
    1.12  
    1.13    interface Client dmem_client;
    1.14 -    interface Get request  = toGet(dataReqQ);
    1.15 -    interface Put response = toPut(dataRespQ);
    1.16 +    interface Get request  = fifoToGet(dataReqQ);
    1.17 +    interface Put response = fifoToPut(dataRespQ);
    1.18    endinterface
    1.19  
    1.20    interface Get statsEn_get = toGet(asReg(cp0_statsEn));
    1.21 @@ -620,10 +620,7 @@
    1.22  //    endmethod
    1.23  //  endinterface
    1.24       
    1.25 -
    1.26 -     interface Get sampleOutput = fifoToGet(outAudioFifo);
    1.27 -
    1.28 -
    1.29 +  interface Get sampleOutput = fifoToGet(outAudioFifo);
    1.30  
    1.31  endmodule
    1.32  

     2.1 --- a/modules/bluespec/Pygar/core/audioCore.bsv	Tue Apr 27 23:43:41 2010 -0400
     2.2 +++ b/modules/bluespec/Pygar/core/audioCore.bsv	Wed Apr 28 00:21:02 2010 -0400
     2.3 @@ -40,9 +40,7 @@
     2.4  `include "asim/provides/processor.bsh"
     2.5  `include "asim/provides/audio_pipe_types.bsh"
     2.6  
     2.7 -
     2.8 -
     2.9 -interface AudioCore;
    2.10 +interface Core;
    2.11  
    2.12    // Interface from core to main memory
    2.13     interface Client#(MainMemReq,MainMemResp) mmem_client;
    2.14 @@ -51,7 +49,7 @@
    2.15        
    2.16  endinterface
    2.17  
    2.18 -module   [CONNECTED_MODULE]  mkCore( AudioCore );
    2.19 +module   [CONNECTED_MODULE]  mkCore( Core );
    2.20  
    2.21    // Instantiate the modules
    2.22  
    2.23 @@ -64,8 +62,8 @@
    2.24  
    2.25    mkConnection( proc.statsEn_get,   icache.statsEn_put );
    2.26    mkConnection( proc.statsEn_get,   dcache.statsEn_put );
    2.27 -  mkConnection( proc.imem_client,   icache.proc_server );
    2.28 -  mkConnection( proc.dmem_client,   dcache.proc_server );
    2.29 +//  mkConnection( proc.imem_client,   icache.proc_server );
    2.30 +//  mkConnection( proc.dmem_client,   dcache.proc_server );
    2.31    mkConnection( icache.mmem_client, marb.cache0_server );
    2.32    mkConnection( dcache.mmem_client, marb.cache1_server );
    2.33