changeset 21:561d3a06ffc5

updated for VMS name chgs from VMS__malloc to VMS_int__malloc
author Some Random Person <seanhalle@yahoo.com>
date Sun, 01 Apr 2012 13:33:18 -0700
parents 8d9d367e96f9
children c11c48758df3
files .hgignore CircuitNetlistCreator.c HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h main.c
diffstat 4 files changed, 8 insertions(+), 14 deletions(-) [+]
line diff
     1.1 --- a/.hgignore	Sun Feb 12 01:47:58 2012 -0800
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,9 +0,0 @@
     1.4 -syntax: glob
     1.5 -
     1.6 -nbproject
     1.7 -build
     1.8 -dist
     1.9 -*.o
    1.10 -.dep.inc
    1.11 -Makefile
    1.12 -notes
     2.1 --- a/CircuitNetlistCreator.c	Sun Feb 12 01:47:58 2012 -0800
     2.2 +++ b/CircuitNetlistCreator.c	Sun Apr 01 13:33:18 2012 -0700
     2.3 @@ -7,7 +7,7 @@
     2.4   */
     2.5  #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h"
     2.6   
     2.7 -/*'' is an expr resolves to an actual commPath struct instance
     2.8 +/* is an expr resolves to an actual commPath struct instance
     2.9   */
    2.10  #define setCommPathValuesTo( commPath, fromElIdx, outPort, toElIdx, inPort,\
    2.11                               commTimeFnPtr, dataPtr)\
    2.12 @@ -78,9 +78,9 @@
    2.13     netlist->numCommPaths= numCommPaths;
    2.14     netlist->commPaths= commPaths;
    2.15        //TL 0, out-port 0 to TL 1, in-port 0
    2.16 -   setCommPathValuesTo(commPaths[0], 0,0,1,0, &commPath_TimeSpanCalc, NULL); 
    2.17 + //  setCommPathValuesTo(commPaths[0], 0,0,1,0, &commPath_TimeSpanCalc, NULL); 
    2.18        //TL 1, out-port 0 to TL 0, in-port 0
    2.19 -   setCommPathValuesTo(commPaths[1], 1,0,0,0, &commPath_TimeSpanCalc, NULL);
    2.20 + //  setCommPathValuesTo(commPaths[1], 1,0,0,0, &commPath_TimeSpanCalc, NULL);
    2.21     
    2.22     //TODO: decide how do in-out bidirectional commPaths -- thinking make it two
    2.23     // separate commPaths with guard between in-port and out-port
     3.1 --- a/HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h	Sun Feb 12 01:47:58 2012 -0800
     3.2 +++ b/HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h	Sun Apr 01 13:33:18 2012 -0700
     3.3 @@ -9,7 +9,7 @@
     3.4  
     3.5  #include <stdio.h>
     3.6  
     3.7 -#include "../../VMS_Implementations/HWSim_impl/HWSim_lib.h"
     3.8 +#include "VMS_Implementations/HWSim_impl/HWSim_lib.h"
     3.9  
    3.10  
    3.11  //===============================  Defines  ==============================
    3.12 @@ -34,6 +34,9 @@
    3.13  uint64
    3.14  pingPongElem_PingActivity_timing( void * dataFromBehaviorFn );
    3.15  
    3.16 +HWSimTimeSpan
    3.17 +commPath_TimeSpanCalc( HWSimCommPath *commPath, HWSimActivityInst *sendingActivity );
    3.18 +
    3.19  //======================== Simulation Fake ==================================
    3.20  #ifdef FAKE
    3.21  HWSimResults* create_simulation_results__fake(void *simParams,HWSimNetlist *netlist);
     4.1 --- a/main.c	Sun Feb 12 01:47:58 2012 -0800
     4.2 +++ b/main.c	Sun Apr 01 13:33:18 2012 -0700
     4.3 @@ -47,7 +47,7 @@
     4.4  #endif
     4.5  
     4.6        //HWSim 
     4.7 -   HWSim__generate_paraver_output(argv[2], simResults, netlist);
     4.8 +   //HWSim__generate_paraver_output(argv[2], simResults, netlist);
     4.9     //HWSim__generate_vcd_output( simResults );
    4.10     
    4.11     exit(0); //cleans up