# HG changeset patch # User Some Random Person # Date 1333312398 25200 # Node ID 561d3a06ffc5ce3f228747d238a07ea6d2054249 # Parent 8d9d367e96f9945cfb2208e811ed47b51dbc5194 updated for VMS name chgs from VMS__malloc to VMS_int__malloc diff -r 8d9d367e96f9 -r 561d3a06ffc5 .hgignore --- a/.hgignore Sun Feb 12 01:47:58 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -syntax: glob - -nbproject -build -dist -*.o -.dep.inc -Makefile -notes diff -r 8d9d367e96f9 -r 561d3a06ffc5 CircuitNetlistCreator.c --- a/CircuitNetlistCreator.c Sun Feb 12 01:47:58 2012 -0800 +++ b/CircuitNetlistCreator.c Sun Apr 01 13:33:18 2012 -0700 @@ -7,7 +7,7 @@ */ #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h" -/*'' is an expr resolves to an actual commPath struct instance +/* is an expr resolves to an actual commPath struct instance */ #define setCommPathValuesTo( commPath, fromElIdx, outPort, toElIdx, inPort,\ commTimeFnPtr, dataPtr)\ @@ -78,9 +78,9 @@ netlist->numCommPaths= numCommPaths; netlist->commPaths= commPaths; //TL 0, out-port 0 to TL 1, in-port 0 - setCommPathValuesTo(commPaths[0], 0,0,1,0, &commPath_TimeSpanCalc, NULL); + // setCommPathValuesTo(commPaths[0], 0,0,1,0, &commPath_TimeSpanCalc, NULL); //TL 1, out-port 0 to TL 0, in-port 0 - setCommPathValuesTo(commPaths[1], 1,0,0,0, &commPath_TimeSpanCalc, NULL); + // setCommPathValuesTo(commPaths[1], 1,0,0,0, &commPath_TimeSpanCalc, NULL); //TODO: decide how do in-out bidirectional commPaths -- thinking make it two // separate commPaths with guard between in-port and out-port diff -r 8d9d367e96f9 -r 561d3a06ffc5 HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h --- a/HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h Sun Feb 12 01:47:58 2012 -0800 +++ b/HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h Sun Apr 01 13:33:18 2012 -0700 @@ -9,7 +9,7 @@ #include -#include "../../VMS_Implementations/HWSim_impl/HWSim_lib.h" +#include "VMS_Implementations/HWSim_impl/HWSim_lib.h" //=============================== Defines ============================== @@ -34,6 +34,9 @@ uint64 pingPongElem_PingActivity_timing( void * dataFromBehaviorFn ); +HWSimTimeSpan +commPath_TimeSpanCalc( HWSimCommPath *commPath, HWSimActivityInst *sendingActivity ); + //======================== Simulation Fake ================================== #ifdef FAKE HWSimResults* create_simulation_results__fake(void *simParams,HWSimNetlist *netlist); diff -r 8d9d367e96f9 -r 561d3a06ffc5 main.c --- a/main.c Sun Feb 12 01:47:58 2012 -0800 +++ b/main.c Sun Apr 01 13:33:18 2012 -0700 @@ -47,7 +47,7 @@ #endif //HWSim - HWSim__generate_paraver_output(argv[2], simResults, netlist); + //HWSim__generate_paraver_output(argv[2], simResults, netlist); //HWSim__generate_vcd_output( simResults ); exit(0); //cleans up