changeset 39:5a30f173bbac pygar svn.40

[svn r40] no longer cpu terminating dependent
author punk
date Tue, 04 May 2010 19:32:25 -0400
parents 05598d745f99
children 7ac38b0f93fa
files modules/bluespec/Pygar/core/AudioCoreSystem.cpp modules/bluespec/Pygar/core/audioCorePipeline.bsv
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Tue May 04 19:27:38 2010 -0400
     1.2 +++ b/modules/bluespec/Pygar/core/AudioCoreSystem.cpp	Tue May 04 19:32:25 2010 -0400
     1.3 @@ -104,7 +104,7 @@
     1.4    //rlm: here we read both files. later refactor into a function.
     1.5    // also, this will terminate when the FIRST file reaches its end.
     1.6    while( fread(&sample, 2, 1, inputFile)) //&& (fread(&sample1, 2 , 1, inputFile1))) 
     1.7 -  {
     1.8 +  { /*
     1.9      printf("hi\n");
    1.10       if (!coreFin && (result = clientStub->ReadCPUToHost(0)) != 1) 
    1.11       {
    1.12 @@ -123,6 +123,7 @@
    1.13  	 printf("\n***SOFT_CORE PASSED***\n");
    1.14  	 coreFin = true;
    1.15         }
    1.16 +    */
    1.17  
    1.18       if(count%1000 == 0)
    1.19       printf("main: %d\n", count);
     2.1 --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Tue May 04 19:27:38 2010 -0400
     2.2 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Tue May 04 19:32:25 2010 -0400
     2.3 @@ -50,6 +50,8 @@
     2.4     Core core <- mkCore;
     2.5     Reg#(int) cycle <- mkReg(0);
     2.6  
     2.7 +//   Reg#(Bit#(32)) ac_fini <- mkReg(0);
     2.8 +
     2.9    //External memory 
    2.10    // I'm not comfortable assuming that the memory subsystem is in order  
    2.11    // So I'll insert a completion buffer here.
    2.12 @@ -107,14 +109,14 @@
    2.13  
    2.14     //*****  SERVER Side  *****
    2.15  
    2.16 -   (* conservative_implicit_conditions *)
    2.17 +/*   (* conservative_implicit_conditions *)
    2.18    rule handleCPUToHost;
    2.19     let req <- server_stub.acceptRequest_ReadCPUToHost();
    2.20      case (req)
    2.21       0: server_stub.sendResponse_ReadCPUToHost(cp0_tohost);
    2.22      endcase
    2.23    endrule
    2.24 -   
    2.25 +*/   
    2.26     rule feedInput;
    2.27       let command <- server_stub.acceptRequest_SendUnprocessedStream();
    2.28       AudioProcessorControl ctrl = unpack(truncate(command.ctrl));