Fixed memory address widths

applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc

@@ -84,23 +84,7 @@
          type = "String";
       }
    }
-   element pio_pps.mem
-   {
-      datum baseAddress
-      {
-         value = "728";
-         type = "long";
-      }
-   }
-   element reg_diag_data_buffer_re.mem
-   {
-      datum baseAddress
-      {
-         value = "256";
-         type = "long";
-      }
-   }
-   element rom_system_info.mem
+   element pio_system_info.mem
    {
       datum _lockedAddress
       {
@@ -109,7 +93,7 @@
       }
       datum baseAddress
       {
-         value = "4096";
+         value = "0";
          type = "long";
       }
    }
@@ -126,48 +110,56 @@
          type = "long";
       }
    }
-   element ram_diag_data_buffer_im.mem
+   element reg_diag_data_buffer_re.mem
    {
       datum baseAddress
       {
-         value = "262144";
+         value = "256";
          type = "long";
       }
    }
-   element ram_diag_data_buffer_re.mem
+   element reg_diag_data_buffer_im.mem
    {
       datum baseAddress
       {
-         value = "393216";
+         value = "128";
          type = "long";
       }
    }
-   element ram_diag_bg.mem
+   element rom_system_info.mem
+   {
+      datum _lockedAddress
       {
+         value = "1";
+         type = "boolean";
+      }
       datum baseAddress
       {
-         value = "16384";
+         value = "4096";
          type = "long";
       }
    }
-   element pio_system_info.mem
+   element pio_pps.mem
    {
-      datum _lockedAddress
+      datum baseAddress
       {
-         value = "1";
-         type = "boolean";
+         value = "728";
+         type = "long";
+      }
    }
+   element ram_diag_data_buffer_im.mem
+   {
       datum baseAddress
       {
-         value = "0";
+         value = "262144";
          type = "long";
       }
    }
-   element reg_diag_data_buffer_im.mem
+   element ram_diag_data_buffer_re.mem
    {
       datum baseAddress
       {
-         value = "128";
+         value = "393216";
          type = "long";
       }
    }
@@ -187,19 +179,27 @@
          type = "long";
       }
    }
+   element reg_unb_sens.mem
+   {
+      datum baseAddress
+      {
+         value = "608";
+         type = "long";
+      }
+   }
    element ram_ss_ss_wide.mem
    {
       datum baseAddress
       {
-         value = "524288";
+         value = "32768";
          type = "long";
       }
    }
-   element reg_unb_sens.mem
+   element ram_diag_bg.mem
    {
       datum baseAddress
       {
-         value = "608";
+         value = "524288";
          type = "long";
       }
    }
@@ -207,7 +207,7 @@
    {
       datum baseAddress
       {
-         value = "32768";
+         value = "16384";
          type = "long";
       }
    }
@@ -378,19 +378,24 @@
          type = "int";
       }
    }
-   element pio_wdi.s1
+   element timer_0.s1
    {
       datum baseAddress
       {
-         value = "704";
+         value = "576";
          type = "long";
       }
    }
-   element timer_0.s1
+   element onchip_memory2_0.s1
+   {
+      datum _lockedAddress
       {
+         value = "1";
+         type = "boolean";
+      }
       datum baseAddress
       {
-         value = "576";
+         value = "131072";
          type = "long";
       }
    }
@@ -402,16 +407,11 @@
          type = "long";
       }
    }
-   element onchip_memory2_0.s1
-   {
-      datum _lockedAddress
+   element pio_wdi.s1
    {
-         value = "1";
-         type = "boolean";
-      }
       datum baseAddress
       {
-         value = "131072";
+         value = "704";
          type = "long";
       }
    }
@@ -440,8 +440,8 @@
  <parameter name="maxAdditionalLatency" value="0" />
  <parameter name="projectName" value="unb1_reorder.qpf" />
  <parameter name="sopcBorderPoints" value="true" />
- <parameter name="systemHash" value="-41978026405" />
- <parameter name="timeStamp" value="1427105050254" />
+ <parameter name="systemHash" value="-42915926488" />
+ <parameter name="timeStamp" value="1427107370112" />
  <parameter name="useTestBenchNamingPattern" value="false" />
  <module kind="clock_source" version="11.1" enabled="1" name="clk_0">
   <parameter name="clockFrequency" value="25000000" />
@@ -542,7 +542,7 @@
   <parameter name="dcache_numTCDM" value="_0" />
   <parameter name="dcache_lineSize" value="_32" />
   <parameter name="dcache_bursts" value="false" />
-  <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer_im.mem' start='0x80' end='0x100' /><slave name='reg_diag_data_buffer_re.mem' start='0x100' end='0x180' /><slave name='reg_bsn_monitor.mem' start='0x180' end='0x200' /><slave name='avs_eth_0.mms_reg' start='0x200' end='0x240' /><slave name='timer_0.s1' start='0x240' end='0x260' /><slave name='reg_unb_sens.mem' start='0x260' end='0x280' /><slave name='reg_diag_bg.mem' start='0x280' end='0x2A0' /><slave name='altpll_0.pll_slave' start='0x2A0' end='0x2B0' /><slave name='pio_debug_wave.s1' start='0x2B0' end='0x2C0' /><slave name='pio_wdi.s1' start='0x2C0' end='0x2D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x2D0' end='0x2D8' /><slave name='pio_pps.mem' start='0x2D8' end='0x2E0' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='ram_diag_bg.mem' start='0x4000' end='0x8000' /><slave name='avs_eth_0.mms_ram' start='0x8000' end='0x9000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='ram_diag_data_buffer_im.mem' start='0x40000' end='0x60000' /><slave name='ram_diag_data_buffer_re.mem' start='0x60000' end='0x80000' /><slave name='ram_ss_ss_wide.mem' start='0x80000' end='0xA0000' /></address-map>]]></parameter>
+  <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer_im.mem' start='0x80' end='0x100' /><slave name='reg_diag_data_buffer_re.mem' start='0x100' end='0x180' /><slave name='reg_bsn_monitor.mem' start='0x180' end='0x200' /><slave name='avs_eth_0.mms_reg' start='0x200' end='0x240' /><slave name='timer_0.s1' start='0x240' end='0x260' /><slave name='reg_unb_sens.mem' start='0x260' end='0x280' /><slave name='reg_diag_bg.mem' start='0x280' end='0x2A0' /><slave name='altpll_0.pll_slave' start='0x2A0' end='0x2B0' /><slave name='pio_debug_wave.s1' start='0x2B0' end='0x2C0' /><slave name='pio_wdi.s1' start='0x2C0' end='0x2D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x2D0' end='0x2D8' /><slave name='pio_pps.mem' start='0x2D8' end='0x2E0' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='avs_eth_0.mms_ram' start='0x4000' end='0x5000' /><slave name='ram_ss_ss_wide.mem' start='0x8000' end='0x10000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='ram_diag_data_buffer_im.mem' start='0x40000' end='0x60000' /><slave name='ram_diag_data_buffer_re.mem' start='0x60000' end='0x80000' /><slave name='ram_diag_bg.mem' start='0x80000' end='0xA0000' /></address-map>]]></parameter>
   <parameter name="dataAddrWidth" value="20" />
   <parameter name="customInstSlavesSystemInfo" value="&lt;info/&gt;" />
   <parameter name="cpuReset" value="false" />
@@ -872,12 +872,12 @@ q]]></parameter>
   <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
  </module>
  <module kind="avs_common_mm" version="1.0" enabled="1" name="ram_diag_bg">
-  <parameter name="g_adr_w" value="12" />
+  <parameter name="g_adr_w" value="15" />
   <parameter name="g_dat_w" value="32" />
   <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
  </module>
  <module kind="avs_common_mm" version="1.0" enabled="1" name="ram_ss_ss_wide">
-  <parameter name="g_adr_w" value="15" />
+  <parameter name="g_adr_w" value="13" />
   <parameter name="g_dat_w" value="32" />
   <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
  </module>
@@ -1123,7 +1123,7 @@ q]]></parameter>
    start="cpu_0.data_master"
    end="ram_diag_bg.mem">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x4000" />
+  <parameter name="baseAddress" value="0x00080000" />
  </connection>
  <connection
    kind="clock"
@@ -1136,7 +1136,7 @@ q]]></parameter>
    start="cpu_0.data_master"
    end="ram_ss_ss_wide.mem">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00080000" />
+  <parameter name="baseAddress" value="0x8000" />
  </connection>
  <connection
    kind="clock"
@@ -1174,7 +1174,7 @@ q]]></parameter>
    start="cpu_0.data_master"
    end="avs_eth_0.mms_ram">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x8000" />
+  <parameter name="baseAddress" value="0x4000" />
  </connection>
  <connection
    kind="interrupt"