Skip to content

Commit 54a5d4d

Browse files
GorgonMeducerGorgonMeducer
committed
fix gcc support
1 parent 7242e80 commit 54a5d4d

10 files changed

+236
-39
lines changed

‎GorgonMeducer.perf_counter.pdsc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@
174174
<accept Tcompiler="GCC"/>
175175
<accept Tcompiler="CLANG"/>
176176
</condition>
177+
178+
<condition id="No GCC">
179+
<description>Deny GNU Tools for Arm Embedded Processors.</description>
180+
<deny Tcompiler="GCC"/>
181+
<accept condition="Arm Compiler"/>
182+
</condition>
177183

178184
<condition id="Armv8.1-M Processors">
179185
<accept Dcore="ARMV81MML"/>
@@ -337,7 +343,7 @@
337343
<component Cclass="Utilities" Cversion="2.5.2" Cgroup="perf_counter" Csub="Core" Cvariant="Source" isDefaultVariant="true" condition="CMSIS-CORE">
338344
<description>A dedicated performance counter for Cortex-M systick.</description>
339345
<files>
340-
<file category="preIncludeGlobal" name="perfc_common.h"/>
346+
<file category="preIncludeGlobal" name="perfc_common.h" condition="No GCC"/>
341347
<file category="header" name="perf_counter.h"/>
342348
<file category="sourceC" name="perf_counter.c" />
343349
<file category="sourceC" name="perfc_port_default.c" />
@@ -359,7 +365,7 @@
359365
<component Cclass="Utilities" Cversion="2.5.2" Cgroup="perf_counter" Csub="Core" Cvariant="SourceNoWrapper" isDefaultVariant="false" condition="CMSIS-CORE">
360366
<description>A dedicated performance counter for Cortex-M systick.</description>
361367
<files>
362-
<file category="preIncludeGlobal" name="perfc_common.h"/>
368+
<file category="preIncludeGlobal" name="perfc_common.h" condition="No GCC"/>
363369
<file category="header" name="perf_counter.h"/>
364370
<file category="sourceC" name="perf_counter.c" />
365371
<file category="sourceC" name="perfc_port_default.c" />
@@ -503,7 +509,7 @@ extern void __rt_thread_scheduler_hook(struct rt_thread *from, struct rt_thread
503509
<component Cclass="Language Extension" Cgroup="Coroutine" Cversion="1.0.0" condition="perf_counter">
504510
<description>A C software infrastructure for coroutines.</description>
505511
<files>
506-
<file category="preIncludeGlobal" name="__perfc_task_common.h"/>
512+
<file category="preIncludeGlobal" name="__perfc_task_common.h" condition="No GCC"/>
507513
<file category="sourceC" name="perfc_task_coroutine.c"/>
508514
</files>
509515
<Pre_Include_Global_h>

‎example/example.uvmpw

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<project>
1717
<PathAndName>.\gcc_example.uvprojx</PathAndName>
18+
<NodeIsExpanded>1</NodeIsExpanded>
1819
</project>
1920

2021
</ProjectWorkspace>

‎example/example.uvoptx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@
847847

848848
<Group>
849849
<GroupName>::Language Extension</GroupName>
850-
<tvExp>1</tvExp>
850+
<tvExp>0</tvExp>
851851
<tvExpOptDlg>0</tvExpOptDlg>
852852
<cbSel>0</cbSel>
853853
<RteFlg>1</RteFlg>

‎example/example.uvprojx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<ListingPath>.\</ListingPath>
5959
<HexFormatSelection>1</HexFormatSelection>
6060
<Merge32K>0</Merge32K>
61-
<CreateBatchFile>0</CreateBatchFile>
61+
<CreateBatchFile>1</CreateBatchFile>
6262
<BeforeCompile>
6363
<RunUserProg1>0</RunUserProg1>
6464
<RunUserProg2>0</RunUserProg2>

‎example/gcc_example.uvoptx

Lines changed: 79 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<OPTFL>
7676
<tvExp>1</tvExp>
7777
<tvExpOptDlg>0</tvExpOptDlg>
78-
<IsCurrentTarget>0</IsCurrentTarget>
78+
<IsCurrentTarget>1</IsCurrentTarget>
7979
</OPTFL>
8080
<CpuCode>7</CpuCode>
8181
<DebugOpt>
@@ -103,7 +103,7 @@
103103
<bEvRecOn>1</bEvRecOn>
104104
<bSchkAxf>0</bSchkAxf>
105105
<bTchkAxf>0</bTchkAxf>
106-
<nTsel>5</nTsel>
106+
<nTsel>0</nTsel>
107107
<sDll></sDll>
108108
<sDllPa></sDllPa>
109109
<sDlgDll></sDlgDll>
@@ -114,9 +114,14 @@
114114
<tDlgDll></tDlgDll>
115115
<tDlgPa></tDlgPa>
116116
<tIfile></tIfile>
117-
<pMon>BIN\DbgFM.DLL</pMon>
117+
<pMon>BIN\UL2CM3.DLL</pMon>
118118
</DebugOpt>
119119
<TargetDriverDllRegistry>
120+
<SetRegEntry>
121+
<Number>0</Number>
122+
<Key>UL2CM3</Key>
123+
<Name>UL2CM3(-S0 -C0 -P0 -FC1000 -FD20000000</Name>
124+
</SetRegEntry>
120125
<SetRegEntry>
121126
<Number>0</Number>
122127
<Key>ARMRTXEVENTFLAGS</Key>
@@ -137,16 +142,6 @@
137142
<Key>DLGUARM</Key>
138143
<Name>(105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)</Name>
139144
</SetRegEntry>
140-
<SetRegEntry>
141-
<Number>0</Number>
142-
<Key>DbgFM</Key>
143-
<Name>-I -S"System Generator:FVP_MPS2_Cortex_M0_MDK" -L"armcortexm0ct" -O4102 -C0 -MC".\FVP\MPS2_Cortex-M\FVP_MPS2_Cortex-M0_MDK.exe" -MF -PF -MA</Name>
144-
</SetRegEntry>
145-
<SetRegEntry>
146-
<Number>0</Number>
147-
<Key>UL2CM3</Key>
148-
<Name>UL2CM3(-S0 -C0 -P0 -FC1000 -FD20000000</Name>
149-
</SetRegEntry>
150145
</TargetDriverDllRegistry>
151146
<Breakpoint/>
152147
<MemoryWindow1>
@@ -280,7 +275,7 @@
280275
<OPTFL>
281276
<tvExp>1</tvExp>
282277
<tvExpOptDlg>0</tvExpOptDlg>
283-
<IsCurrentTarget>1</IsCurrentTarget>
278+
<IsCurrentTarget>0</IsCurrentTarget>
284279
</OPTFL>
285280
<CpuCode>7</CpuCode>
286281
<DebugOpt>
@@ -441,7 +436,7 @@
441436
<GroupNumber>1</GroupNumber>
442437
<FileNumber>1</FileNumber>
443438
<FileType>1</FileType>
444-
<tvExp>0</tvExp>
439+
<tvExp>1</tvExp>
445440
<tvExpOptDlg>0</tvExpOptDlg>
446441
<bDave2>0</bDave2>
447442
<PathWithFileName>.\gcc\startup_ARMCM0.c</PathWithFileName>
@@ -505,6 +500,54 @@
505500
<RteFlg>0</RteFlg>
506501
<bShared>0</bShared>
507502
</File>
503+
<File>
504+
<GroupNumber>2</GroupNumber>
505+
<FileNumber>6</FileNumber>
506+
<FileType>1</FileType>
507+
<tvExp>0</tvExp>
508+
<tvExpOptDlg>0</tvExpOptDlg>
509+
<bDave2>0</bDave2>
510+
<PathWithFileName>.\pt_example.c</PathWithFileName>
511+
<FilenameWithoutPath>pt_example.c</FilenameWithoutPath>
512+
<RteFlg>0</RteFlg>
513+
<bShared>0</bShared>
514+
</File>
515+
<File>
516+
<GroupNumber>2</GroupNumber>
517+
<FileNumber>7</FileNumber>
518+
<FileType>5</FileType>
519+
<tvExp>0</tvExp>
520+
<tvExpOptDlg>0</tvExpOptDlg>
521+
<bDave2>0</bDave2>
522+
<PathWithFileName>.\pt_example.h</PathWithFileName>
523+
<FilenameWithoutPath>pt_example.h</FilenameWithoutPath>
524+
<RteFlg>0</RteFlg>
525+
<bShared>0</bShared>
526+
</File>
527+
<File>
528+
<GroupNumber>2</GroupNumber>
529+
<FileNumber>8</FileNumber>
530+
<FileType>1</FileType>
531+
<tvExp>0</tvExp>
532+
<tvExpOptDlg>0</tvExpOptDlg>
533+
<bDave2>0</bDave2>
534+
<PathWithFileName>.\cpt_example.c</PathWithFileName>
535+
<FilenameWithoutPath>cpt_example.c</FilenameWithoutPath>
536+
<RteFlg>0</RteFlg>
537+
<bShared>0</bShared>
538+
</File>
539+
<File>
540+
<GroupNumber>2</GroupNumber>
541+
<FileNumber>9</FileNumber>
542+
<FileType>5</FileType>
543+
<tvExp>0</tvExp>
544+
<tvExpOptDlg>0</tvExpOptDlg>
545+
<bDave2>0</bDave2>
546+
<PathWithFileName>.\cpt_example.h</PathWithFileName>
547+
<FilenameWithoutPath>cpt_example.h</FilenameWithoutPath>
548+
<RteFlg>0</RteFlg>
549+
<bShared>0</bShared>
550+
</File>
508551
</Group>
509552

510553
<Group>
@@ -515,7 +558,7 @@
515558
<RteFlg>0</RteFlg>
516559
<File>
517560
<GroupNumber>3</GroupNumber>
518-
<FileNumber>6</FileNumber>
561+
<FileNumber>10</FileNumber>
519562
<FileType>1</FileType>
520563
<tvExp>0</tvExp>
521564
<tvExpOptDlg>0</tvExpOptDlg>
@@ -527,7 +570,7 @@
527570
</File>
528571
<File>
529572
<GroupNumber>3</GroupNumber>
530-
<FileNumber>7</FileNumber>
573+
<FileNumber>11</FileNumber>
531574
<FileType>5</FileType>
532575
<tvExp>0</tvExp>
533576
<tvExpOptDlg>0</tvExpOptDlg>
@@ -539,7 +582,7 @@
539582
</File>
540583
<File>
541584
<GroupNumber>3</GroupNumber>
542-
<FileNumber>8</FileNumber>
585+
<FileNumber>12</FileNumber>
543586
<FileType>2</FileType>
544587
<tvExp>0</tvExp>
545588
<tvExpOptDlg>0</tvExpOptDlg>
@@ -551,7 +594,7 @@
551594
</File>
552595
<File>
553596
<GroupNumber>3</GroupNumber>
554-
<FileNumber>9</FileNumber>
597+
<FileNumber>13</FileNumber>
555598
<FileType>1</FileType>
556599
<tvExp>0</tvExp>
557600
<tvExpOptDlg>0</tvExpOptDlg>
@@ -563,7 +606,7 @@
563606
</File>
564607
<File>
565608
<GroupNumber>3</GroupNumber>
566-
<FileNumber>10</FileNumber>
609+
<FileNumber>14</FileNumber>
567610
<FileType>5</FileType>
568611
<tvExp>0</tvExp>
569612
<tvExpOptDlg>0</tvExpOptDlg>
@@ -583,4 +626,20 @@
583626
<RteFlg>1</RteFlg>
584627
</Group>
585628

629+
<Group>
630+
<GroupName>::Language Extension</GroupName>
631+
<tvExp>1</tvExp>
632+
<tvExpOptDlg>0</tvExpOptDlg>
633+
<cbSel>0</cbSel>
634+
<RteFlg>1</RteFlg>
635+
</Group>
636+
637+
<Group>
638+
<GroupName>::Utilities</GroupName>
639+
<tvExp>1</tvExp>
640+
<tvExpOptDlg>0</tvExpOptDlg>
641+
<cbSel>0</cbSel>
642+
<RteFlg>1</RteFlg>
643+
</Group>
644+
586645
</ProjectOpt>

0 commit comments

Comments
 (0)