From d2647bf70be9cd01d77447dfa5cd6f0bc13c6520 Mon Sep 17 00:00:00 2001
From: Enzo Slamnia <slamnia@insa-toulouse.fr>
Date: Wed, 15 Mar 2023 18:20:23 +0100
Subject: [PATCH] 1ere partie

---
 soft/PjtKEIL_StepDeb_1/BacASable.uvoptx  | 44 +++++++++++++++++++++---
 soft/PjtKEIL_StepDeb_1/BacASable.uvprojx |  9 ++---
 soft/PjtKEIL_StepDeb_1/Src/Delay.s       | 26 +++++++-------
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx
index ed76561..4010242 100644
--- a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx
+++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx
@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj; *.o</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -154,6 +154,21 @@
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>VarTime</ItemText>
+        </Ww>
+      </WatchWindow1>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x20000000</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -174,7 +189,7 @@
         <AscS3>0</AscS3>
         <aSer3>0</aSer3>
         <eProf>0</eProf>
-        <aLa>0</aLa>
+        <aLa>1</aLa>
         <aPa1>0</aPa1>
         <AscS4>0</AscS4>
         <aSer4>0</aSer4>
@@ -196,6 +211,18 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
+      <LogicAnalyzers>
+        <Wi>
+          <IntNumber>0</IntNumber>
+          <FirstString>((portb &amp; 0x00000002) &gt;&gt; 1 &amp; 0x2) &gt;&gt; 1</FirstString>
+          <SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1000000000000000000000000000000000000000DE030008</SecondString>
+        </Wi>
+        <Wi>
+          <IntNumber>1</IntNumber>
+          <FirstString>`VarTime</FirstString>
+          <SecondString>0080000000000000000000000000000040772B410000000000000000000000000000000056617254696D65000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1000000000000000000000000000000000000000DC030008</SecondString>
+        </Wi>
+      </LogicAnalyzers>
       <DebugDescription>
         <Enable>1</Enable>
         <EnableFlashSeq>0</EnableFlashSeq>
@@ -260,7 +287,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -339,11 +366,18 @@
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>VarTime</ItemText>
+        </Ww>
+      </WatchWindow1>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>257</SubType>
-          <ItemText>r0</ItemText>
+          <ItemText>0x20000000</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx b/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx
index 9c192f5..2318c0c 100644
--- a/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx
+++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx
@@ -10,7 +10,7 @@
       <TargetName>Simu</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -424,7 +424,7 @@
       <TargetName>CibleSondeKEIL</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -1338,11 +1338,6 @@
     <Layers>
       <Layer>
         <LayName>&lt;Project Info&gt;</LayName>
-        <LayDesc></LayDesc>
-        <LayUrl></LayUrl>
-        <LayKeys></LayKeys>
-        <LayCat></LayCat>
-        <LayLic></LayLic>
         <LayTarg>0</LayTarg>
         <LayPrjMark>1</LayPrjMark>
       </Layer>
diff --git a/soft/PjtKEIL_StepDeb_1/Src/Delay.s b/soft/PjtKEIL_StepDeb_1/Src/Delay.s
index bf49175..12b0ca8 100644
--- a/soft/PjtKEIL_StepDeb_1/Src/Delay.s
+++ b/soft/PjtKEIL_StepDeb_1/Src/Delay.s
@@ -10,17 +10,17 @@
 ;Section RAM (read write):
 	area    maram,data,readwrite
 		
-VarTime	dcd 0
+VarTime	dcd 0 ; short_int* VarTime = malloc() memset(VarTime,0,sizeof...)
 
 	
 ; ===============================================================================================
 	
 ;constantes (équivalent du #define en C)
-TimeValue	equ 900000
+TimeValue	equ 900000 ; #define TIMEVALUE 900000
 
 
 	EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules.
-
+	EXPORT VarTime
 		
 ;Section ROM code (read only) :		
 	area    moncode,code,readonly
@@ -39,21 +39,23 @@ TimeValue	equ 900000
 ;
 ; et donc possède un intérêt pour débuter en ASM pur
 
-Delay_100ms proc
+Delay_100ms proc ; procédure
 	
-	    ldr r0,=VarTime  		  
+	    ldr r0,=VarTime  ; *r0 = VarTime (= 0)		  
 						  
-		ldr r1,=TimeValue
-		str r1,[r0]
+		ldr r1,=TimeValue ; *r1 = TimeValue
+		str r1,[r0] ; met la valeur TimeValue stockée dans R1 dans l'adresse mémoire
+					; spécifiée dans R0
 		
 BoucleTempo	
-		ldr r1,[r0]     				
+		ldr r1,[r0] 		; r1 = *r0    				
 						
-		subs r1,#1
-		str  r1,[r0]
-		bne	 BoucleTempo
+		subs r1,#1 			; r1 = r1 - 1 (avec retenue)
+		str  r1,[r0]		; same que en haut
+		bne	 BoucleTempo	; branchement qui appelle BoucleTempo si 
+							; l'instruction d'avant est non equal
 			
-		bx lr
+		bx lr				; retour de fonction
 		endp