# HG changeset patch # User rlm # Date 1272425498 14400 # Node ID 9910c032f38d79bc98ff357cdf27c55f98c6f3da # Parent bb7db7d1b37c9076f3837e0f7e0426e138b5bff6 [svn r20] fixed some random reference errot diff -r bb7db7d1b37c -r 9910c032f38d modules/bluespec/Pygar/core/Core.bsv --- a/modules/bluespec/Pygar/core/Core.bsv Tue Apr 27 23:06:26 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -// The MIT License - -// Copyright (c) 2009 Massachusetts Institute of Technology - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -import Connectable::*; -import GetPut::*; -import ClientServer::*; - -import DataCacheBlocking::*; -import InstCacheBlocking::*; -import Processor::*; -import MemArb::*; -import MemTypes::*; - -interface CoreStats; - interface DCacheStats dcache; - interface ICacheStats icache; - interface ProcStats proc; -endinterface - -interface Core; - - // Interface from core to main memory - interface Client#(MainMemReq,MainMemResp) mmem_client; - - // Statistics - interface CoreStats stats; - - // CPU to Host - interface CPUToHost tohost; - -endinterface - -(* synthesize *) -module mkCore(Core); - - // Instantiate the modules - Proc proc <- mkProc(); - ICache#(InstReq,InstResp) icache <- mkInstCache(); - DCache#(DataReq,DataResp) dcache <- mkDataCache(); - MemArb marb <- mkMemArb(); - - // Internal connections - mkConnection( proc.statsEn_get, icache.statsEn_put ); - mkConnection( proc.statsEn_get, dcache.statsEn_put ); - mkConnection( proc.imem_client, icache.proc_server ); - mkConnection( proc.dmem_client, dcache.proc_server ); - mkConnection( icache.mmem_client, marb.cache0_server ); - mkConnection( dcache.mmem_client, marb.cache1_server ); - - // Methods - interface mmem_client = marb.mmem_client; - - interface CoreStats stats; - interface dcache = dcache.stats; - interface icache = icache.stats; - interface proc = proc.stats; - endinterface - - interface CPUToHost tohost = proc.tohost; - -endmodule - diff -r bb7db7d1b37c -r 9910c032f38d modules/bluespec/Pygar/core/Core.bsv~ --- a/modules/bluespec/Pygar/core/Core.bsv~ Tue Apr 27 23:06:26 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -// The MIT License - -// Copyright (c) 2009 Massachusetts Institute of Technology - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -import Connectable::*; -import GetPut::*; -import ClientServer::*; - -import DataCacheBlocking::*; -import InstCacheBlocking::*; -import Processor::*; -import MemArb::*; -import MemTypes::*; - -interface CoreStats; - interface DCacheStats dcache; - interface ICacheStats icache; - interface ProcStats proc; -endinterface - -interface Core; - - // Interface from core to main memory - interface Client#(MainMemReq,MainMemResp) mmem_client; - - // Statistics - interface CoreStats stats; - - // CPU to Host - interface CPUToHost tohost; - -endinterface - -(* synthesize *) -module mkCore(Core); - - // Instantiate the modules - Proc proc <- mkProc(); - ICache#(InstReq,InstResp) icache <- mkInstCache(); - DCache#(DataReq,DataResp) dcache <- mkDataCache(); - MemArb marb <- mkMemArb(); - - // Internal connections - mkConnection( proc.statsEn_get, icache.statsEn_put ); - mkConnection( proc.statsEn_get, dcache.statsEn_put ); - mkConnection( proc.imem_client, icache.proc_server ); - mkConnection( proc.dmem_client, dcache.proc_server ); - mkConnection( icache.mmem_client, marb.cache0_server ); - mkConnection( dcache.mmem_client, marb.cache1_server ); - - // Methods - interface mmem_client = marb.mmem_client; - - interface CoreStats stats; - interface dcache = dcache.stats; - interface icache = icache.stats; - interface proc = proc.stats; - endinterface - - interface CPUToHost tohost = proc.tohost; - -endmodule - diff -r bb7db7d1b37c -r 9910c032f38d modules/bluespec/Pygar/core/Processor.bsv --- a/modules/bluespec/Pygar/core/Processor.bsv Tue Apr 27 23:06:26 2010 -0400 +++ b/modules/bluespec/Pygar/core/Processor.bsv Tue Apr 27 23:31:38 2010 -0400 @@ -20,6 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. + + import Connectable::*; import GetPut::*; import ClientServer::*; @@ -618,9 +620,9 @@ // endmethod // endinterface - interface Get sampleOutput; - interface sampleOutput = fifoToGet(outAudioFifo); - endinterface + + interface Get sampleOutput = fifoToGet(outAudioFifo); + endmodule diff -r bb7db7d1b37c -r 9910c032f38d modules/bluespec/Pygar/core/audioCore.bsv --- a/modules/bluespec/Pygar/core/audioCore.bsv Tue Apr 27 23:06:26 2010 -0400 +++ b/modules/bluespec/Pygar/core/audioCore.bsv Tue Apr 27 23:31:38 2010 -0400 @@ -41,7 +41,8 @@ `include "asim/provides/audio_pipe_types.bsh" -interface Core; + +interface AudioCore; // Interface from core to main memory interface Client#(MainMemReq,MainMemResp) mmem_client; @@ -50,7 +51,7 @@ endinterface -module [CONNECTED_MODULE] mkCore( Core ); +module [CONNECTED_MODULE] mkCore( AudioCore ); // Instantiate the modules