diff src/Application/main.c @ 8:3276b8621f96

Merged -- issues with line endings, tried adding .hgeol.. see what happens
author Me@portablequad
date Wed, 04 Jan 2012 15:50:49 -0800
parents 648207f2e38f
children
line diff
     1.1 --- a/src/Application/main.c	Tue Dec 06 18:46:42 2011 +0100
     1.2 +++ b/src/Application/main.c	Wed Jan 04 15:50:49 2012 -0800
     1.3 @@ -1,52 +1,52 @@
     1.4 -/*
     1.5 - *  Copyright 2011 OpenSourceStewardshipFoundation.org
     1.6 - *  Licensed under BSD
     1.7 - *
     1.8 - * author seanhalle@yahoo.com
     1.9 - */
    1.10 - 
    1.11 -#include <malloc.h>
    1.12 -#include <stdlib.h>
    1.13 -
    1.14 -#include "SimParams.h"
    1.15 -#include "HWSim__Hello_World_HW/HWSim__Hello_World_HW.h"
    1.16 -
    1.17 -char __ProgrammName[] = "HWSim Hello World";
    1.18 -char __DataSet[255];
    1.19 -char __Scheduler[];
    1.20 -
    1.21 -/*
    1.22 - *
    1.23 - * 
    1.24 - */
    1.25 -
    1.26 -int main( int argc, char **argv )
    1.27 - { ParamBag      *simParams;
    1.28 -   HWSimNetlist  *netlist;
    1.29 -   HWSimResults  *simResults;
    1.30 -
    1.31 -   printf( "param file name: %s\n", argv[1] );
    1.32 -   printf("Paraver trace file %s\n", argv[2]);
    1.33 -
    1.34 -#ifdef FAKE
    1.35 -	simParams= NULL;
    1.36 -#else
    1.37 -   simParams = makeParamBag();
    1.38 -   readParamFileIntoBag( argv[1], simParams );
    1.39 -#endif
    1.40 -   
    1.41 -   netlist = createPingPongNetlist();
    1.42 -#ifdef FAKE
    1.43 -   simResults= create_simulation_results__fake(simParams,netlist);
    1.44 -#else
    1.45 -   simResults = 
    1.46 -    HWSim__run_simulation( simParams, netlist );
    1.47 -#endif
    1.48 -
    1.49 -      //HWSim 
    1.50 -   HWSim__generate_paraver_output(argv[2], simResults, netlist);
    1.51 -   //HWSim__generate_vcd_output( simResults );
    1.52 -   
    1.53 -   exit(0); //cleans up
    1.54 - }
    1.55 -
    1.56 +/*
    1.57 + *  Copyright 2011 OpenSourceStewardshipFoundation.org
    1.58 + *  Licensed under BSD
    1.59 + *
    1.60 + * author seanhalle@yahoo.com
    1.61 + */
    1.62 + 
    1.63 +#include <malloc.h>
    1.64 +#include <stdlib.h>
    1.65 +
    1.66 +#include "SimParams.h"
    1.67 +#include "HWSim__Hello_World_HW/HWSim__Hello_World_HW.h"
    1.68 +
    1.69 +char __ProgrammName[] = "HWSim Hello World";
    1.70 +char __DataSet[255];
    1.71 +char __Scheduler[];
    1.72 +
    1.73 +/*
    1.74 + *
    1.75 + * 
    1.76 + */
    1.77 +
    1.78 +int main( int argc, char **argv )
    1.79 + { ParamBag      *simParams;
    1.80 +   HWSimNetlist  *netlist;
    1.81 +   HWSimResults  *simResults;
    1.82 +
    1.83 +   printf( "param file name: %s\n", argv[1] );
    1.84 +   printf("Paraver trace file %s\n", argv[2]);
    1.85 +
    1.86 +#ifdef FAKE
    1.87 +	simParams= NULL;
    1.88 +#else
    1.89 +   simParams = makeParamBag();
    1.90 +   readParamFileIntoBag( argv[1], simParams );
    1.91 +#endif
    1.92 +   
    1.93 +   netlist = createPingPongNetlist();
    1.94 +#ifdef FAKE
    1.95 +   simResults= create_simulation_results__fake(simParams,netlist);
    1.96 +#else
    1.97 +   simResults = 
    1.98 +    HWSim__run_simulation( simParams, netlist );
    1.99 +#endif
   1.100 +
   1.101 +      //HWSim 
   1.102 +   HWSim__generate_paraver_output(argv[2], simResults, netlist);
   1.103 +   //HWSim__generate_vcd_output( simResults );
   1.104 +   
   1.105 +   exit(0); //cleans up
   1.106 + }
   1.107 +