bugfix

MPSoC/generated_src/main.c

@@ -49,8 +49,8 @@ pthread_barrier_t barrier ;
 pthread_attr_t *attr_t;
 pthread_mutex_t __mainMutex;
 
-#define MWMRADDR 0x20200000
-#define LOCKSADDR 0x30200000
+#define MWMRADDR 0xB0200000
+#define LOCKSADDR 0xC0200000
 #define base(arg) arg
 
 typedef struct mwmr_s mwmr_t;

MPSoC/generated_topcell/deployinfo.h

@@ -3,11 +3,11 @@
 #define CACHED_RAM0_ADDR 0x10000000
 #define CACHED_RAM0_SIZE 0x8000
 #define DEPLOY_RAM0_NAME uram0
-#define DEPLOY_RAM0_ADDR 0x10000000200000
+#define DEPLOY_RAM0_ADDR 0x10200000
 #define DEPLOY_RAM0_SIZE 0x8000
 #define CACHED_RAM1_NAME cram1
-#define CACHED_RAM1_ADDR 0x10000000
+#define CACHED_RAM1_ADDR 0x20000000
 #define CACHED_RAM1_SIZE 0x8000
 #define DEPLOY_RAM1_NAME uram1
-#define DEPLOY_RAM1_ADDR 0x10000000200000
+#define DEPLOY_RAM1_ADDR 0x20200000
 #define DEPLOY_RAM1_SIZE 0x8000

bin/config.xml

@@ -66,7 +66,7 @@
 
 
 
-<LastWindowAttributes x="219" y="92" width="1461" height="933" max="false" />
+<LastWindowAttributes x="832" y="194" width="1461" height="933" max="false" />
 
 
 <ProVerifHash data=""/>

src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java

@@ -173,8 +173,8 @@ public class TasksAndMainGenerator {
                
 	//the address of mwmr segments is currently hard coded for powerPC; will be changed later
 	
-        mainFile.appendToBeforeMainCode("#define MWMRADDR 0x20200000" + CR );
-        mainFile.appendToBeforeMainCode("#define LOCKSADDR 0x30200000" + CR );
+        mainFile.appendToBeforeMainCode("#define MWMRADDR 0xB0200000" + CR );
+        mainFile.appendToBeforeMainCode("#define LOCKSADDR 0xC0200000" + CR );
         mainFile.appendToBeforeMainCode("#define base(arg) arg" + CR2 );
         mainFile.appendToBeforeMainCode("typedef struct mwmr_s mwmr_t;" + CR2);
 

src/ddtranslatorSoclib/toTopCell/Deployinfo.java

@@ -41,17 +41,14 @@ public class Deployinfo {
     /* for the moment, this is specific to PowerPC */
   
     public static String getDeployInfo() {
-	int i=0; 
-        int calculated_addr = 2130706432;// 0x7f000000 currently fixed
 
-       //address is fixed for the moment but can be given in the DDiagram or calculated
+        int calculated_addr = 2130706432;// 0x7f000000 currently fixed for power pc
+     
         String deployinfo = CR;
-
-	/* special case: there is only one memory bank and/or at least one CHANNEL channel is mapped to it */
-	
+	int i=1;
 	for (AvatarRAM ram : TopCellGenerator.avatardd.getAllRAM()) {
 	    //String string_adress_start = Integer.toHexString(calculated_addr);
-String string_adress_start = Integer.toHexString(268435456);
+	    String string_adress_start = Integer.toHexString(i*268435456);
 	// if((ram.getNo_ram()==0)&&(!(ram.getChannels().isEmpty()))){
 	   
 		//deployinfo = "#define DEPLOY_RAM" + i + "_NAME mem_ram"+ CR;
@@ -66,15 +63,10 @@ String string_adress_start = Integer.toHexString(268435456);
 	    deployinfo = deployinfo + "#define CACHED_RAM" + ram.getNo_ram()  + "_SIZE 0x"+ string_size + CR; 
 
 	    deployinfo += "#define DEPLOY_RAM" + ram.getNo_ram()  + "_NAME uram" + ram.getNo_ram() + CR;
-	    //}
-	    deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getNo_ram()  + "_ADDR 0x" + (string_adress_start+Integer.toHexString(2097152)) + CR; // attention this must be hexadecimal	   	  
+	   
+	    deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getNo_ram()  + "_ADDR 0x" + (Integer.toHexString((i*268435456)+2097152)) + CR; // attention this must be hexadecimal	   	  
 	    deployinfo = deployinfo + "#define DEPLOY_RAM" + ram.getNo_ram()  + "_SIZE 0x"+ string_size + CR; 
-
-// attention this must be hexadecimal
-	    //calculated_addr=calculated_addr-16777216; // attention this must be hexadecimal	
-	    //	    calculated_addr=calculated_addr-33554432;
-	    //i++;
-	    // } 
+	    i++;
 	}
 	return deployinfo;	
     }