diff main.c @ 19:ba3883d39e62

small changes
author hausers
date Fri, 02 Mar 2012 18:14:06 +0100
parents b0e9969d8d15
children 3a4be4048a21
line diff
     1.1 --- a/main.c	Mon Feb 20 19:07:31 2012 +0100
     1.2 +++ b/main.c	Fri Mar 02 18:14:06 2012 +0100
     1.3 @@ -12,6 +12,8 @@
     1.4  #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h"
     1.5  #include "../C_Libraries/ParamHelper/Param.h"
     1.6  
     1.7 +#include "../VMS_Implementations/HWSim_impl/HWSim_tests.h"
     1.8 +
     1.9  
    1.10  char __ProgrammName[] = "HWSim Hello World";
    1.11  char __DataSet[255];
    1.12 @@ -27,32 +29,31 @@
    1.13     HWSimNetlist  *netlist;
    1.14     HWSimResults  *simResults;
    1.15  
    1.16 -	printf("DEBUG: main\n");
    1.17 -
    1.18  #ifdef FAKE
    1.19  	simParams= NULL;
    1.20     printf( "param file name: %s\n", argv[1] );
    1.21     printf("Paraver trace file %s\n", argv[2]);
    1.22  
    1.23  #else
    1.24 -	//Sean: cause Segmentation fault in VMS_int__malloc, I think the reason for
    1.25 -	//			this is, that VMS is not initialized yet ?
    1.26 -	//			=> so I continue without params
    1.27 +	
    1.28 +        // TODO use the pure C branch of paramBag
    1.29  //   simParams = makeParamBag();
    1.30  //   readParamFileIntoBag( argv[1], simParams );
    1.31  #endif
    1.32     
    1.33     netlist = createPingPongNetlist();
    1.34 +
    1.35  #ifdef FAKE
    1.36     simResults= create_simulation_results__fake(simParams,netlist);
    1.37  #else
    1.38     simResults = 
    1.39      HWSim__run_simulation( NULL, netlist );
    1.40 +//	HWSim_test__run();
    1.41  #endif
    1.42  
    1.43        //HWSim 
    1.44     //HWSim__generate_paraver_output(argv[2], simResults, netlist); //Stefan: my version
    1.45 -	HWSim__generate_paraver_output(simResults);
    1.46 +	//HWSim__generate_paraver_output(simResults);
    1.47     //HWSim__generate_vcd_output( simResults );
    1.48     
    1.49     exit(0); //cleans up