comparison main.c @ 16:df53f52ef49c

naming conflicts fixed HWSimResults changed, so FakeSim needs an update -> TODO Stefan
author hausers
date Fri, 17 Feb 2012 17:41:12 +0100
parents 8d9d367e96f9
children b0e9969d8d15
comparison
equal deleted inserted replaced
2:bfb6c1b5b72e 3:8ad943b2baed
8 #include <malloc.h> 8 #include <malloc.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 10
11 #include "SimParams.h" 11 #include "SimParams.h"
12 #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h" 12 #include "HWSim__PingPong__HWDef/HWSim__PingPong__HWDef.h"
13 //Stefan: name conflict here -- MC_shared version of params is in HWSim__PingPong__HWDef.h, but need normal C version here
14 #include "../C_Libraries/ParamHelper/Param.h" 13 #include "../C_Libraries/ParamHelper/Param.h"
15 14
16 15
17 char __ProgrammName[] = "HWSim Hello World"; 16 char __ProgrammName[] = "HWSim Hello World";
18 char __DataSet[255]; 17 char __DataSet[255];
19 char __Scheduler[]; 18 char __Scheduler[1];
20 19
21 /* 20 /*
22 * 21 *
23 * 22 *
24 */ 23 */
45 simResults = 44 simResults =
46 HWSim__run_simulation( simParams, netlist ); 45 HWSim__run_simulation( simParams, netlist );
47 #endif 46 #endif
48 47
49 //HWSim 48 //HWSim
50 HWSim__generate_paraver_output(argv[2], simResults, netlist); 49 //HWSim__generate_paraver_output(argv[2], simResults, netlist); //Stefan: my version
50 HWSim__generate_paraver_output(simResults);
51 //HWSim__generate_vcd_output( simResults ); 51 //HWSim__generate_vcd_output( simResults );
52 52
53 exit(0); //cleans up 53 exit(0); //cleans up
54 } 54 }
55 55