From 2ae098f92117ea45ed781c506cbd93b92429df51 Mon Sep 17 00:00:00 2001
From: Alan Dutems <dutems@insa-toulouse.fr>
Date: Wed, 17 May 2023 11:53:03 +0200
Subject: [PATCH] StepDFT

---
 soft/PjtKEIL_StepDFT/Src/DFT.s      | 21 +++++++++++++++------
 soft/PjtKEIL_StepDFT/StepDFT.uvoptx |  8 ++++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/soft/PjtKEIL_StepDFT/Src/DFT.s b/soft/PjtKEIL_StepDFT/Src/DFT.s
index c4248f7..95bbc31 100644
--- a/soft/PjtKEIL_StepDFT/Src/DFT.s
+++ b/soft/PjtKEIL_StepDFT/Src/DFT.s
@@ -24,20 +24,23 @@ DFT_ModuleAuCarre proc
 		
 		push{r4, r5, r6, r7, r8, r9, r10, r11, r12}
 		
-		mov r0, #0 ; index
+		mov r10, #0 ; index
 		mov r7, #0 ; resultat cos
 		mov r8, #0 ; resultat sin
 		
 Boucle
 		
 		ldr r4, =LeSignal		
-		ldrsh r4, [r4,r0, lsl#1]
+		ldrsh r4, [r4,r10, lsl#1]
+		
+		mul r9, r0, r10 
+		and r11, r9, #63
 		
 		ldr r5, =TabCos
-		ldrsh r5, [r5,r0, lsl#1]
+		ldrsh r5, [r5,r11, lsl#1]
 		
 		ldr r6, =TabSin
-		ldrsh r6, [r6,r0, lsl#1]
+		ldrsh r6, [r6,r11, lsl#1]
 		
 		mul r5,r5,r4
 		add r7, r7, r5
@@ -45,12 +48,18 @@ Boucle
 		mul r6,r6,r4
 		add r8,r8,r6
 		
-		add r0, #1
+		add r10, #1
 		
-		cmp r0, #64
+		cmp r10, #64
 		blt Boucle
 		
+		;Format 5.27
 		
+		smull r9,r10,r7,r7
+		smlal r9,r10,r8,r8
+		mov r0,r10
+		
+		;Format 10.22
 		
 		pop{r4, r5, r6, r7, r8, r9, r10, r11, r12}
 		
diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
index 78263b0..c102e2f 100644
--- a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
+++ b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
@@ -157,18 +157,18 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>30</LineNumber>
+          <LineNumber>60</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134218370</Address>
+          <Address>134218478</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Src\principal.c</Filename>
+          <Filename>.\Src\DFT.s</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\StepDFT\Src/principal.c\30</Expression>
+          <Expression>\\StepDFT\Src/DFT.s\60</Expression>
         </Bp>
       </Breakpoint>
       <Tracepoint>