Merge pull request #1458 from nanoframework/release-v1.3.2

Release 1.3.2

Author: josesimoes

azure-pipelines.yml

@@ -340,15 +340,31 @@ jobs:
     vmImage: 'VS2017-Win2016'
 
   steps:
-  
+  # create or update GitHub release
+  - task: GitHubReleasePublish@1
+    inputs:
+      githubEndpoint: 'nanoframework'
+      githubOwner: 'nanoframework'
+      githubRepositoryName: nf-interpreter
+      githubTag: v$(NBGV_Version)
+      githubReleaseTitle: 'nf Interpreter v$(NBGV_Version)'
+      githubTargetCommitsh: $(Build.SourceVersion)
+      githubReleaseDraft: true
+      githubReleasePrerelease: true
+      githubReuseDraftOnly: true
+      githubReuseRelease: true
+      githubEditRelease: true
+      githubDeleteEmptyTag: true
+    condition: and( succeeded(), not( startsWith(variables['Build.SourceBranch'], 'refs/pull') ), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ) )
+    displayName: Create/Update GitHub release
+    
   - task: GitHubReleasePublish@1
     inputs:
       githubEndpoint: 'nanoframework'
       githubOwner: 'nanoframework'
       githubRepositoryName: nf-interpreter
       githubTag: v$(NBGV_Version)
       githubReleaseTitle: 'nf Interpreter v$(NBGV_Version)'
-      githubReleaseNotes: 
       githubTargetCommitsh: $(Build.SourceVersion)
       githubReleaseDraft: false
       githubReleasePrerelease: false

targets/CMSIS-OS/ChibiOS/common/LaunchCLR.c

@@ -35,6 +35,8 @@ void LaunchCLR(uint32_t address)
 
 bool CheckValidCLRImage(uint32_t address)
 {
+    uint32_t resetVectorAddress;
+
     // load nanoCLR vector table
     const vectors_t* nanoCLRVectorTable = (vectors_t*) address;
 
@@ -51,9 +53,27 @@ bool CheckValidCLRImage(uint32_t address)
     // that's an assembly "b.n" (branch instruction) the very first one in the Reset_Handler function
     // see os\common\startup\ARMCMx\compilers\GCC\vectors.S
 
+
+    // for series that have ART Accelerator the handlers addresses stored in the vector table are for ITCM access 
+    // need to parsed them to reach the equivalent address in AXI access
+    #ifdef FLASHITCM_BASE
+    
+    // read address (ITCM)
+    resetVectorAddress = (uint32_t)((uint32_t*)nanoCLRVectorTable->reset_handler);
+    // parse it to get the address in the AXI range
+    resetVectorAddress -= FLASHITCM_BASE;
+    resetVectorAddress += FLASHAXI_BASE;
+
+    #else
+    
+    // "regular" address mapping
+    resetVectorAddress = (uint32_t)((uint32_t*)nanoCLRVectorTable->reset_handler);
+    
+    #endif
+
     // sanity check for invalid address (out of flash range which causes a hard fault)
-    if( (uint32_t)((uint32_t*)nanoCLRVectorTable->reset_handler) <= FLASH1_MEMORY_StartAddress ||
-        (uint32_t)((uint32_t*)nanoCLRVectorTable->reset_handler) >= (FLASH1_MEMORY_StartAddress + FLASH1_MEMORY_Size) )
+    if( resetVectorAddress <= FLASH1_MEMORY_StartAddress ||
+        resetVectorAddress >= (FLASH1_MEMORY_StartAddress + FLASH1_MEMORY_Size) )
     {
         // check failed, doesn't seem to be a valid CLR image
         return false;

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "assemblyVersion": {
     "precision": "revision"
   },