release fff v1.0.0

dh-linghaibin · May 18, 2023 · b18e7dd · b18e7dd
1 parent c00c8ce
commit b18e7dd
Show file tree

Hide file tree

Showing 13 changed files with 150 additions and 39 deletions.
diff --git a/Utilities/fineFileFramework/ARM.fineFileFramework.pdsc b/Utilities/fineFileFramework/ARM.fineFileFramework.pdsc
@@ -16,7 +16,7 @@
   <repository type="git"></repository>
 
   <releases>
-    <release date="2023-04-26" version="0.10.2" tag="0.10.2" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/ARM.fineFileFramework.0.10.2.pack">
+    <release date="2023-05-18" version="1.0.0" tag="1.0.0" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/ARM.fineFileFramework.1.0.0.pack">
       - First release
       - Minor fixes
       - Introduce macro __FFF_CFG_IGNORE_NO_SEMIHOSTING__ 
@@ -30,6 +30,7 @@
       - Simplified helper macros
       - Add a helper function for list folder structures
       - Add a helper macro for accessing files and folders inside a given path
+      - Add fffyml2c.py
     </release>
   </releases>
 
@@ -221,10 +222,12 @@
                 <file category="sourceC"    name="source/fine_file_framework/__memory_file.c" />
                 <file category="sourceC"    name="source/fine_file_framework/file_retarget.c" />
 
-                <file category="header"     name="source/fine_file_framework/template/fff_cfg.h"                       attr="config" version="1.0.7"/>
+                <file category="header"     name="source/fine_file_framework/template/fff_cfg.h"                       attr="config" version="1.0.8"/>
                 <file category="other"      name="source/fine_file_framework/template/__fff_user_def_file_framework.c" attr="config" version="1.1.0"/>
-                <file category="sourceC"    name="source/fine_file_framework/fff_user_description.c"                   attr="config" version="1.0.8"/>
-                <file category="other"      name="source/fine_file_framework/template/fffyml2c.py"                     attr="config" version="0.8.0"/>
+                <file category="sourceC"    name="source/fine_file_framework/fff_user_description.c"                   attr="config" version="1.1.0"/>
+                <file category="other"      name="source/fine_file_framework/template/fffyml2c.py"                     attr="config" version="1.0.1"/>
+                <file category="other"      name="source/fine_file_framework/template/user.yml"                        attr="config" version="1.0.0"/>
+                <file category="other"      name="source/fine_file_framework/template/generate.bat"                    attr="config" version="1.0.0"/>
                 <file category="sourceAsm"  name="source/fine_file_framework/template/fffyml2c.s"                      attr="config" version="1.0.0" condition="Arm Compiler 5"/>
               </files>
               <RTE_Components_h>

diff --git a/...is-pack/ARM.fineFileFramework.0.10.2.pack → ...sis-pack/ARM.fineFileFramework.1.0.0.pack b/...is-pack/ARM.fineFileFramework.0.10.2.pack → ...sis-pack/ARM.fineFileFramework.1.0.0.pack
diff --git a/Utilities/fineFileFramework/cmsis-pack/ARM.fineFileFramework.pdsc b/Utilities/fineFileFramework/cmsis-pack/ARM.fineFileFramework.pdsc
@@ -16,7 +16,7 @@
   <repository type="git"></repository>
 
   <releases>
-    <release date="2023-04-26" version="0.10.2" tag="0.10.2" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/ARM.fineFileFramework.0.10.2.pack">
+    <release date="2023-05-18" version="1.0.0" tag="1.0.0" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/ARM.fineFileFramework.1.0.0.pack">
       - First release
       - Minor fixes
       - Introduce macro __FFF_CFG_IGNORE_NO_SEMIHOSTING__ 
@@ -30,6 +30,7 @@
       - Simplified helper macros
       - Add a helper function for list folder structures
       - Add a helper macro for accessing files and folders inside a given path
+      - Add fffyml2c.py
     </release>
   </releases>
 
@@ -221,10 +222,12 @@
                 <file category="sourceC"    name="source/fine_file_framework/__memory_file.c" />
                 <file category="sourceC"    name="source/fine_file_framework/file_retarget.c" />
 
-                <file category="header"     name="source/fine_file_framework/template/fff_cfg.h"                       attr="config" version="1.0.7"/>
+                <file category="header"     name="source/fine_file_framework/template/fff_cfg.h"                       attr="config" version="1.0.8"/>
                 <file category="other"      name="source/fine_file_framework/template/__fff_user_def_file_framework.c" attr="config" version="1.1.0"/>
-                <file category="sourceC"    name="source/fine_file_framework/fff_user_description.c"                   attr="config" version="1.0.8"/>
-                <file category="other"      name="source/fine_file_framework/template/fffyml2c.py"                     attr="config" version="0.8.0"/>
+                <file category="sourceC"    name="source/fine_file_framework/fff_user_description.c"                   attr="config" version="1.1.0"/>
+                <file category="other"      name="source/fine_file_framework/template/fffyml2c.py"                     attr="config" version="1.0.1"/>
+                <file category="other"      name="source/fine_file_framework/template/user.yml"                        attr="config" version="1.0.0"/>
+                <file category="other"      name="source/fine_file_framework/template/generate.bat"                    attr="config" version="1.0.0"/>
                 <file category="sourceAsm"  name="source/fine_file_framework/template/fffyml2c.s"                      attr="config" version="1.0.0" condition="Arm Compiler 5"/>
               </files>
               <RTE_Components_h>

diff --git a/Utilities/fineFileFramework/source/build/MDK/RTE/_mps2_armv7m/Pre_Include_Global.h b/Utilities/fineFileFramework/source/build/MDK/RTE/_mps2_armv7m/Pre_Include_Global.h
@@ -10,10 +10,8 @@
 #ifndef PRE_INCLUDE_GLOBAL_H
 #define PRE_INCLUDE_GLOBAL_H
 
-/* ARM.fine File Framework::File System:fine File Framework:Core:Stdio:1.0.0 */
-#define __FILE_INCOMPLETE  1
-#define __CUSTOM_FILE_IO__ 1
-#define __FILE_defined     1
+/* GorgonMeducer::Utilities:perf_counter:Core:Source:2.2.0 */
+#define __PERF_COUNTER_CFG_USE_SYSTICK_WRAPPER__ 1
 
 
 #endif /* PRE_INCLUDE_GLOBAL_H */
diff --git a/Utilities/fineFileFramework/source/build/MDK/RTE/_mps2_cortex_m55/Pre_Include_Global.h b/Utilities/fineFileFramework/source/build/MDK/RTE/_mps2_cortex_m55/Pre_Include_Global.h
@@ -12,6 +12,8 @@
 
 /* ARM.fine File Framework::File System:fine File Framework:Core:Stdio:1.0.0 */
 #define __FILE_INCOMPLETE  1
+#define __CUSTOM_FILE_IO__ 1
+#define __FILE_defined     1
 
 
 #endif /* PRE_INCLUDE_GLOBAL_H */
diff --git a/Utilities/fineFileFramework/source/build/MDK/fineFileFramework.uvoptx b/Utilities/fineFileFramework/source/build/MDK/fineFileFramework.uvoptx
@@ -125,7 +125,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DbgFMv8M</Key>
-          <Name>-I -S -L"cpu0" -O4102 -C0 -MC".\FVP\MPS2_Cortex-M\FVP_MPS2_Cortex-M55_MDK.exe" -MF"./fvp_m55_cfg.txt" -MA -PF"C:\Work\CPMK\Cortex-M\Project\Fake_File_Framework\git\fine_file_framework\source\build\MDK\MTICoverageOut.cov"</Name>
+          <Name>-I -S"System Generator:FVP_MPS2_Cortex_M55_MDK" -L"cpu0" -O4102 -C0 -MC".\FVP\MPS2_Cortex-M\FVP_MPS2_Cortex-M55_MDK.exe" -MF -PF -MA</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -144,6 +144,38 @@
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>1</SubType>
+          <ItemText>0x20001FAC</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <MemoryWindow2>
+        <Mm>
+          <WinNumber>2</WinNumber>
+          <SubType>1</SubType>
+          <ItemText>0x20000000</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow2>
+      <MemoryWindow3>
+        <Mm>
+          <WinNumber>3</WinNumber>
+          <SubType>1</SubType>
+          <ItemText>0x10000000</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow3>
+      <MemoryWindow4>
+        <Mm>
+          <WinNumber>4</WinNumber>
+          <SubType>1</SubType>
+          <ItemText>0x00000000</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow4>
       <ScvdPack>
         <Filename>C:\Users\gabriel\AppData\Local\Arm\Packs\Keil\ARM_Compiler\1.7.2\EventRecorder.scvd</Filename>
         <Type>Keil.ARM_Compiler.1.7.2</Type>
@@ -155,7 +187,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -172,7 +204,7 @@
         <aLa>0</aLa>
         <aPa1>0</aPa1>
         <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
+        <aSer4>1</aSer4>
         <StkLoc>0</StkLoc>
         <TrcWin>0</TrcWin>
         <newCpu>0</newCpu>
@@ -248,7 +280,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>
@@ -487,7 +519,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>

diff --git a/Utilities/fineFileFramework/source/build/MDK/fineFileFramework.uvprojx b/Utilities/fineFileFramework/source/build/MDK/fineFileFramework.uvprojx
@@ -70,9 +70,9 @@
             <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
+            <UserProg1Name>RTE\File_System\generate.bat</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -862,7 +862,7 @@
             <uC99>1</uC99>
             <uGnu>1</uGnu>
             <useXO>0</useXO>
-            <v6Lang>3</v6Lang>
+            <v6Lang>4</v6Lang>
             <v6LangP>5</v6LangP>
             <vShortEn>1</vShortEn>
             <vShortWch>1</vShortWch>
@@ -1174,9 +1174,9 @@
             <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
+            <UserProg1Name>RTE\File_System\generate.bat</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -1687,7 +1687,7 @@
     <apis/>
     <components>
       <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers">
-        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="0.10.2"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
         <targetInfos>
           <targetInfo excluded="1" name="mps2_armv7m" versionMatchMode=""/>
           <targetInfo name="mps2_armv7m_pack_test"/>
@@ -1872,37 +1872,47 @@
       <file attr="config" category="other" name="source\fine_file_framework\template\__fff_user_def_file_framework.c" version="1.1.0">
         <instance index="0">RTE\File_System\__fff_user_def_file_framework.c</instance>
         <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers"/>
-        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="0.10.2"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
         <targetInfos>
           <targetInfo excluded="1" name="mps2_armv7m"/>
           <targetInfo name="mps2_armv7m_pack_test"/>
           <targetInfo name="mps2_cortex_m55"/>
         </targetInfos>
       </file>
-      <file attr="config" category="header" name="source\fine_file_framework\template\fff_cfg.h" version="1.0.7">
+      <file attr="config" category="header" name="source\fine_file_framework\template\fff_cfg.h" version="1.0.8">
         <instance index="0">RTE\File_System\fff_cfg.h</instance>
         <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers"/>
-        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="0.10.2"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
         <targetInfos>
           <targetInfo excluded="1" name="mps2_armv7m"/>
           <targetInfo name="mps2_armv7m_pack_test"/>
           <targetInfo name="mps2_cortex_m55"/>
         </targetInfos>
       </file>
-      <file attr="config" category="sourceC" name="source\fine_file_framework\fff_user_description.c" version="1.0.8">
+      <file attr="config" category="sourceC" name="source\fine_file_framework\fff_user_description.c" version="1.1.0">
         <instance index="0">RTE\File_System\fff_user_description.c</instance>
         <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers"/>
-        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="0.10.2"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
         <targetInfos>
           <targetInfo excluded="1" name="mps2_armv7m"/>
           <targetInfo name="mps2_armv7m_pack_test"/>
           <targetInfo name="mps2_cortex_m55"/>
         </targetInfos>
       </file>
-      <file attr="config" category="other" name="source\fine_file_framework\template\fffyml2c.py" version="0.8.0">
+      <file attr="config" category="other" name="source\fine_file_framework\template\fffyml2c.py" version="1.0.1">
         <instance index="0">RTE\File_System\fffyml2c.py</instance>
         <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers"/>
-        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="0.10.2"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
+        <targetInfos>
+          <targetInfo excluded="1" name="mps2_armv7m"/>
+          <targetInfo name="mps2_armv7m_pack_test"/>
+          <targetInfo name="mps2_cortex_m55"/>
+        </targetInfos>
+      </file>
+      <file attr="config" category="other" name="source\fine_file_framework\template\generate.bat" version="1.0.0">
+        <instance index="0">RTE\File_System\generate.bat</instance>
+        <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
         <targetInfos>
           <targetInfo excluded="1" name="mps2_armv7m"/>
           <targetInfo name="mps2_armv7m_pack_test"/>
@@ -1921,6 +1931,16 @@
         <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="0.9.6"/>
         <targetInfos/>
       </file>
+      <file attr="config" category="other" name="source\fine_file_framework\template\user.yml" version="1.0.0">
+        <instance index="0">RTE\File_System\user.yml</instance>
+        <component Cbundle="fine File Framework" Cclass="File System" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Supported Compilers"/>
+        <package name="fineFileFramework" schemaVersion="1.4" url="https://raw.githubusercontent.com/ARM-software/EndpointAI/master/Utilities/fineFileFramework/cmsis-pack/" vendor="ARM" version="1.0.0"/>
+        <targetInfos>
+          <targetInfo excluded="1" name="mps2_armv7m"/>
+          <targetInfo name="mps2_armv7m_pack_test"/>
+          <targetInfo name="mps2_cortex_m55"/>
+        </targetInfos>
+      </file>
       <file attr="config" category="header" name="fine_file_framework\template\__fff_user_def_file_framework.c" version="1.0.0">
         <instance index="0" removed="1">RTE\Utility\__fff_user_def_file_framework.c</instance>
         <component Cclass="Utility" Cgroup="fine File Framework" Csub="Core" Cvariant="Stdio" Cvendor="ARM" Cversion="1.0.0" condition="Arm Compiler"/>

diff --git a/Utilities/fineFileFramework/source/fine_file_framework/fff_user_description.c b/Utilities/fineFileFramework/source/fine_file_framework/fff_user_description.c
@@ -103,9 +103,14 @@ enum {
 /*----------------------------------------------------------------------------*
  * Compiler Specific Code to run __vsf_main_entry() before main()             *
  *----------------------------------------------------------------------------*/
+
+#if __FFF_CFG_PATCH_MAIN__ && __IS_COMPILER_ARM_COMPILER__
+int $Sub$$main (int argc, const char* argv[])
+#else
 __attribute__((used))
 __attribute__((constructor, noreturn))
 void __platform_main_entry(void)
+#endif
 {
     const arm_fff_cfg_t tCFG = {
         .ptRoot = (const arm_file_node_t *)&__FFF_CFG_ROOT__,

diff --git a/Utilities/fineFileFramework/source/fine_file_framework/fine_file_framework.c b/Utilities/fineFileFramework/source/fine_file_framework/fine_file_framework.c
@@ -417,12 +417,24 @@ static const arm_file_node_t *__arm_fff_find_node(
 
 
 
+
+#if __FFF_CFG_PATCH_MAIN__ && __IS_COMPILER_ARM_COMPILER__
+extern int $Super$$main (int argc, const char* argv[]);
+#else
 extern int main (int argc, const char* argv[]);
+#endif
 
 static void run_main(void)
 {
     str_arg_t tArgument = get_arg();
-    _sys_exit(main(tArgument.argc, (const char **)tArgument.argv));
+    _sys_exit(
+    #if __FFF_CFG_PATCH_MAIN__ && __IS_COMPILER_ARM_COMPILER__
+        $Super$$main(tArgument.argc, (const char **)tArgument.argv)
+    #else
+        main(tArgument.argc, (const char **)tArgument.argv)
+    #endif
+
+    );
 }
 
 

diff --git a/Utilities/fineFileFramework/source/fine_file_framework/template/fff_cfg.h b/Utilities/fineFileFramework/source/fine_file_framework/template/fff_cfg.h
@@ -40,7 +40,9 @@
 #   define __FFF_CFG_GET_COMMAND_LINE_VIA_SEMIHOSTING__     0
 #endif
 
-//#define __FFF_CFG_INCLUDE_USER_DEFINE_FILE_FRAMEWORK__  "mycustomfs.c"
+#ifndef __FFF_CFG_PATCH_MAIN__
+#   define __FFF_CFG_PATCH_MAIN__                           1
+#endif
 
 /*============================ MACROFIED FUNCTIONS ===========================*/
 /*============================ TYPES =========================================*/