diff --git a/2-2_asm/.cproject b/2-2_asm/.cproject
index 1c0b27151d764af24147ab395b0f9f2ec3b226ed..eefc7230d4d48b99089a3f5a4c65502b3483a5f1 100644
--- a/2-2_asm/.cproject
+++ b/2-2_asm/.cproject
@@ -37,61 +37,61 @@
<option id="gnu.c.compiler.option.misc.other.2118060724" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
<option id="com.crt.advproject.gcc.exe.debug.option.optimization.level.1981818458" name="Optimization Level" superClass="com.crt.advproject.gcc.exe.debug.option.optimization.level" useByScannerDiscovery="false"/>
<option id="com.crt.advproject.gcc.fpu.406853925" name="Floating point" superClass="com.crt.advproject.gcc.fpu" useByScannerDiscovery="false"/>
- <option id="com.crt.advproject.c.misc.dialect.413771633" superClass="com.crt.advproject.c.misc.dialect"/>
- <option id="gnu.c.compiler.option.dialect.flags.114195558" superClass="gnu.c.compiler.option.dialect.flags"/>
- <option id="gnu.c.compiler.option.preprocessor.nostdinc.580152572" superClass="gnu.c.compiler.option.preprocessor.nostdinc"/>
- <option id="gnu.c.compiler.option.preprocessor.preprocess.193466982" superClass="gnu.c.compiler.option.preprocessor.preprocess"/>
- <option id="gnu.c.compiler.option.preprocessor.undef.symbol.643908346" superClass="gnu.c.compiler.option.preprocessor.undef.symbol"/>
- <option id="gnu.c.compiler.option.include.paths.459994470" superClass="gnu.c.compiler.option.include.paths"/>
- <option id="gnu.c.compiler.option.include.files.1743586682" superClass="gnu.c.compiler.option.include.files"/>
- <option id="gnu.c.compiler.option.optimization.flags.630915889" superClass="gnu.c.compiler.option.optimization.flags"/>
- <option id="com.crt.advproject.gcc.exe.debug.option.debugging.level.96740646" superClass="com.crt.advproject.gcc.exe.debug.option.debugging.level"/>
- <option id="gnu.c.compiler.option.debugging.other.332156700" superClass="gnu.c.compiler.option.debugging.other"/>
- <option id="gnu.c.compiler.option.debugging.prof.1316094711" superClass="gnu.c.compiler.option.debugging.prof"/>
- <option id="gnu.c.compiler.option.debugging.gprof.2105487732" superClass="gnu.c.compiler.option.debugging.gprof"/>
- <option id="gnu.c.compiler.option.debugging.codecov.1725555217" superClass="gnu.c.compiler.option.debugging.codecov"/>
- <option id="gnu.c.compiler.option.debugging.sanitaddress.470906941" superClass="gnu.c.compiler.option.debugging.sanitaddress"/>
- <option id="gnu.c.compiler.option.debugging.sanitpointers.241096357" superClass="gnu.c.compiler.option.debugging.sanitpointers"/>
- <option id="gnu.c.compiler.option.debugging.sanitthread.306227980" superClass="gnu.c.compiler.option.debugging.sanitthread"/>
- <option id="gnu.c.compiler.option.debugging.sanitleak.255888724" superClass="gnu.c.compiler.option.debugging.sanitleak"/>
- <option id="gnu.c.compiler.option.debugging.sanitundef.207500707" superClass="gnu.c.compiler.option.debugging.sanitundef"/>
- <option id="gnu.c.compiler.option.warnings.syntax.1509816740" superClass="gnu.c.compiler.option.warnings.syntax"/>
- <option id="gnu.c.compiler.option.warnings.pedantic.298821694" superClass="gnu.c.compiler.option.warnings.pedantic"/>
- <option id="gnu.c.compiler.option.warnings.pedantic.error.858542963" superClass="gnu.c.compiler.option.warnings.pedantic.error"/>
- <option id="gnu.c.compiler.option.warnings.nowarn.623061631" superClass="gnu.c.compiler.option.warnings.nowarn"/>
- <option id="gnu.c.compiler.option.warnings.allwarn.1322739162" superClass="gnu.c.compiler.option.warnings.allwarn"/>
- <option id="gnu.c.compiler.option.warnings.extrawarn.706437377" superClass="gnu.c.compiler.option.warnings.extrawarn"/>
- <option id="gnu.c.compiler.option.warnings.toerrors.1670386550" superClass="gnu.c.compiler.option.warnings.toerrors"/>
- <option id="gnu.c.compiler.option.warnings.wconversion.269227921" superClass="gnu.c.compiler.option.warnings.wconversion"/>
- <option id="gnu.c.compiler.option.warnings.wcastalign.2096584326" superClass="gnu.c.compiler.option.warnings.wcastalign"/>
- <option id="gnu.c.compiler.option.warnings.wcastqual.435993133" superClass="gnu.c.compiler.option.warnings.wcastqual"/>
- <option id="gnu.c.compiler.option.warnings.wdisabledopt.1589805640" superClass="gnu.c.compiler.option.warnings.wdisabledopt"/>
- <option id="gnu.c.compiler.option.warnings.wlogicalop.1260456631" superClass="gnu.c.compiler.option.warnings.wlogicalop"/>
- <option id="gnu.c.compiler.option.warnings.wmissingdecl.1326043020" superClass="gnu.c.compiler.option.warnings.wmissingdecl"/>
- <option id="gnu.c.compiler.option.warnings.wmissingincdir.1938145018" superClass="gnu.c.compiler.option.warnings.wmissingincdir"/>
- <option id="gnu.c.compiler.option.warnings.wredundantdecl.1709689854" superClass="gnu.c.compiler.option.warnings.wredundantdecl"/>
- <option id="gnu.c.compiler.option.warnings.wshadow.1352750394" superClass="gnu.c.compiler.option.warnings.wshadow"/>
- <option id="gnu.c.compiler.option.warnings.wsignconv.2136727398" superClass="gnu.c.compiler.option.warnings.wsignconv"/>
- <option id="gnu.c.compiler.option.warnings.wswitchdef.315012912" superClass="gnu.c.compiler.option.warnings.wswitchdef"/>
- <option id="gnu.c.compiler.option.warnings.wundef.789669579" superClass="gnu.c.compiler.option.warnings.wundef"/>
- <option id="gnu.c.compiler.option.warnings.wwritestrings.1679962384" superClass="gnu.c.compiler.option.warnings.wwritestrings"/>
- <option id="gnu.c.compiler.option.warnings.wfloatequal.725931251" superClass="gnu.c.compiler.option.warnings.wfloatequal"/>
- <option id="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery.1865748769" superClass="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery"/>
- <option id="gnu.c.compiler.option.misc.verbose.1587416049" superClass="gnu.c.compiler.option.misc.verbose"/>
- <option id="gnu.c.compiler.option.misc.ansi.725691931" superClass="gnu.c.compiler.option.misc.ansi"/>
- <option id="gnu.c.compiler.option.misc.pic.810463991" superClass="gnu.c.compiler.option.misc.pic"/>
- <option id="gnu.c.compiler.option.misc.hardening.1280816448" superClass="gnu.c.compiler.option.misc.hardening"/>
- <option id="gnu.c.compiler.option.misc.randomization.834123157" superClass="gnu.c.compiler.option.misc.randomization"/>
- <option id="com.crt.advproject.gcc.lto.90324099" superClass="com.crt.advproject.gcc.lto"/>
- <option id="com.crt.advproject.gcc.lto.fat.999314301" superClass="com.crt.advproject.gcc.lto.fat"/>
- <option id="com.crt.advproject.gcc.merge.constants.793099188" superClass="com.crt.advproject.gcc.merge.constants"/>
- <option id="com.crt.advproject.gcc.prefixmap.131229546" superClass="com.crt.advproject.gcc.prefixmap"/>
- <option id="com.crt.advproject.gcc.thumbinterwork.80940265" superClass="com.crt.advproject.gcc.thumbinterwork"/>
- <option id="com.crt.advproject.gcc.securestate.1229331728" superClass="com.crt.advproject.gcc.securestate"/>
- <option id="com.crt.advproject.gcc.stackusage.1987643773" superClass="com.crt.advproject.gcc.stackusage"/>
- <option id="com.crt.advproject.gcc.specs.793247571" superClass="com.crt.advproject.gcc.specs"/>
- <option id="com.crt.advproject.gcc.config.692816499" superClass="com.crt.advproject.gcc.config"/>
- <option id="com.crt.advproject.gcc.store.1535635950" superClass="com.crt.advproject.gcc.store"/>
+ <option id="com.crt.advproject.c.misc.dialect.413771633" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true"/>
+ <option id="gnu.c.compiler.option.dialect.flags.114195558" superClass="gnu.c.compiler.option.dialect.flags" useByScannerDiscovery="true"/>
+ <option id="gnu.c.compiler.option.preprocessor.nostdinc.580152572" superClass="gnu.c.compiler.option.preprocessor.nostdinc" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.preprocessor.preprocess.193466982" superClass="gnu.c.compiler.option.preprocessor.preprocess" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.preprocessor.undef.symbol.643908346" superClass="gnu.c.compiler.option.preprocessor.undef.symbol" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.include.paths.459994470" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.include.files.1743586682" superClass="gnu.c.compiler.option.include.files" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.optimization.flags.630915889" superClass="gnu.c.compiler.option.optimization.flags" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.exe.debug.option.debugging.level.96740646" superClass="com.crt.advproject.gcc.exe.debug.option.debugging.level" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.other.332156700" superClass="gnu.c.compiler.option.debugging.other" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.prof.1316094711" superClass="gnu.c.compiler.option.debugging.prof" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.gprof.2105487732" superClass="gnu.c.compiler.option.debugging.gprof" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.codecov.1725555217" superClass="gnu.c.compiler.option.debugging.codecov" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitaddress.470906941" superClass="gnu.c.compiler.option.debugging.sanitaddress" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitpointers.241096357" superClass="gnu.c.compiler.option.debugging.sanitpointers" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitthread.306227980" superClass="gnu.c.compiler.option.debugging.sanitthread" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitleak.255888724" superClass="gnu.c.compiler.option.debugging.sanitleak" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitundef.207500707" superClass="gnu.c.compiler.option.debugging.sanitundef" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.syntax.1509816740" superClass="gnu.c.compiler.option.warnings.syntax" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.pedantic.298821694" superClass="gnu.c.compiler.option.warnings.pedantic" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.pedantic.error.858542963" superClass="gnu.c.compiler.option.warnings.pedantic.error" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.nowarn.623061631" superClass="gnu.c.compiler.option.warnings.nowarn" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.allwarn.1322739162" superClass="gnu.c.compiler.option.warnings.allwarn" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.extrawarn.706437377" superClass="gnu.c.compiler.option.warnings.extrawarn" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.toerrors.1670386550" superClass="gnu.c.compiler.option.warnings.toerrors" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wconversion.269227921" superClass="gnu.c.compiler.option.warnings.wconversion" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wcastalign.2096584326" superClass="gnu.c.compiler.option.warnings.wcastalign" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wcastqual.435993133" superClass="gnu.c.compiler.option.warnings.wcastqual" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wdisabledopt.1589805640" superClass="gnu.c.compiler.option.warnings.wdisabledopt" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wlogicalop.1260456631" superClass="gnu.c.compiler.option.warnings.wlogicalop" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wmissingdecl.1326043020" superClass="gnu.c.compiler.option.warnings.wmissingdecl" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wmissingincdir.1938145018" superClass="gnu.c.compiler.option.warnings.wmissingincdir" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wredundantdecl.1709689854" superClass="gnu.c.compiler.option.warnings.wredundantdecl" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wshadow.1352750394" superClass="gnu.c.compiler.option.warnings.wshadow" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wsignconv.2136727398" superClass="gnu.c.compiler.option.warnings.wsignconv" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wswitchdef.315012912" superClass="gnu.c.compiler.option.warnings.wswitchdef" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wundef.789669579" superClass="gnu.c.compiler.option.warnings.wundef" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wwritestrings.1679962384" superClass="gnu.c.compiler.option.warnings.wwritestrings" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wfloatequal.725931251" superClass="gnu.c.compiler.option.warnings.wfloatequal" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery.1865748769" superClass="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.verbose.1587416049" superClass="gnu.c.compiler.option.misc.verbose" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.ansi.725691931" superClass="gnu.c.compiler.option.misc.ansi" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.pic.810463991" superClass="gnu.c.compiler.option.misc.pic" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.hardening.1280816448" superClass="gnu.c.compiler.option.misc.hardening" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.randomization.834123157" superClass="gnu.c.compiler.option.misc.randomization" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.lto.90324099" superClass="com.crt.advproject.gcc.lto" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.lto.fat.999314301" superClass="com.crt.advproject.gcc.lto.fat" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.merge.constants.793099188" superClass="com.crt.advproject.gcc.merge.constants" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.prefixmap.131229546" superClass="com.crt.advproject.gcc.prefixmap" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.thumbinterwork.80940265" superClass="com.crt.advproject.gcc.thumbinterwork" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.securestate.1229331728" superClass="com.crt.advproject.gcc.securestate" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.stackusage.1987643773" superClass="com.crt.advproject.gcc.stackusage" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.specs.793247571" superClass="com.crt.advproject.gcc.specs" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.config.692816499" superClass="com.crt.advproject.gcc.config" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.store.1535635950" superClass="com.crt.advproject.gcc.store" useByScannerDiscovery="false"/>
<inputType id="com.crt.advproject.compiler.input.855908434" superClass="com.crt.advproject.compiler.input"/>
</tool>
<tool id="com.crt.advproject.gas.exe.debug.1860423619" name="MCU Assembler" superClass="com.crt.advproject.gas.exe.debug">
@@ -118,7 +118,7 @@
<tool id="com.crt.advproject.link.exe.debug.742972049" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug">
<option id="com.crt.advproject.link.arch.1188867588" name="Architecture" superClass="com.crt.advproject.link.arch" value="com.crt.advproject.link.target.cm3" valueType="enumerated"/>
<option id="com.crt.advproject.link.thumb.1248295488" name="Thumb mode" superClass="com.crt.advproject.link.thumb" value="true" valueType="boolean"/>
- <option id="com.crt.advproject.link.script.1785160227" name="Linker script" superClass="com.crt.advproject.link.script" value=""2-2_asm_Debug.ld"" valueType="string"/>
+ <option id="com.crt.advproject.link.script.1785160227" name="Linker script" superClass="com.crt.advproject.link.script" value="2-2_asm_Debug.ld" valueType="string"/>
<option id="com.crt.advproject.link.manage.994083104" name="Manage linker script" superClass="com.crt.advproject.link.manage" value="true" valueType="boolean"/>
<option id="gnu.c.link.option.nostdlibs.1585246591" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" value="true" valueType="boolean"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.link.option.other.2121008218" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" valueType="stringList">
@@ -227,62 +227,62 @@
</option>
<option id="gnu.c.compiler.option.misc.other.763971838" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
<option id="com.crt.advproject.gcc.exe.release.option.optimization.level.242711131" name="Optimization Level" superClass="com.crt.advproject.gcc.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.c.optimization.level.size" valueType="enumerated"/>
- <option id="com.crt.advproject.c.misc.dialect.1611109085" superClass="com.crt.advproject.c.misc.dialect"/>
- <option id="gnu.c.compiler.option.dialect.flags.2076081769" superClass="gnu.c.compiler.option.dialect.flags"/>
- <option id="gnu.c.compiler.option.preprocessor.nostdinc.759426810" superClass="gnu.c.compiler.option.preprocessor.nostdinc"/>
- <option id="gnu.c.compiler.option.preprocessor.preprocess.799519724" superClass="gnu.c.compiler.option.preprocessor.preprocess"/>
- <option id="gnu.c.compiler.option.preprocessor.undef.symbol.694234341" superClass="gnu.c.compiler.option.preprocessor.undef.symbol"/>
- <option id="gnu.c.compiler.option.include.paths.1977052775" superClass="gnu.c.compiler.option.include.paths"/>
- <option id="gnu.c.compiler.option.include.files.333497305" superClass="gnu.c.compiler.option.include.files"/>
- <option id="gnu.c.compiler.option.optimization.flags.827202439" superClass="gnu.c.compiler.option.optimization.flags"/>
- <option id="com.crt.advproject.gcc.exe.release.option.debugging.level.1714260887" superClass="com.crt.advproject.gcc.exe.release.option.debugging.level"/>
- <option id="gnu.c.compiler.option.debugging.other.350538606" superClass="gnu.c.compiler.option.debugging.other"/>
- <option id="gnu.c.compiler.option.debugging.prof.366903288" superClass="gnu.c.compiler.option.debugging.prof"/>
- <option id="gnu.c.compiler.option.debugging.gprof.1288078929" superClass="gnu.c.compiler.option.debugging.gprof"/>
- <option id="gnu.c.compiler.option.debugging.codecov.846798027" superClass="gnu.c.compiler.option.debugging.codecov"/>
- <option id="gnu.c.compiler.option.debugging.sanitaddress.33926770" superClass="gnu.c.compiler.option.debugging.sanitaddress"/>
- <option id="gnu.c.compiler.option.debugging.sanitpointers.659779568" superClass="gnu.c.compiler.option.debugging.sanitpointers"/>
- <option id="gnu.c.compiler.option.debugging.sanitthread.180782359" superClass="gnu.c.compiler.option.debugging.sanitthread"/>
- <option id="gnu.c.compiler.option.debugging.sanitleak.964753965" superClass="gnu.c.compiler.option.debugging.sanitleak"/>
- <option id="gnu.c.compiler.option.debugging.sanitundef.1704477005" superClass="gnu.c.compiler.option.debugging.sanitundef"/>
- <option id="gnu.c.compiler.option.warnings.syntax.1363879820" superClass="gnu.c.compiler.option.warnings.syntax"/>
- <option id="gnu.c.compiler.option.warnings.pedantic.885376699" superClass="gnu.c.compiler.option.warnings.pedantic"/>
- <option id="gnu.c.compiler.option.warnings.pedantic.error.1954188926" superClass="gnu.c.compiler.option.warnings.pedantic.error"/>
- <option id="gnu.c.compiler.option.warnings.nowarn.710816613" superClass="gnu.c.compiler.option.warnings.nowarn"/>
- <option id="gnu.c.compiler.option.warnings.allwarn.75157801" superClass="gnu.c.compiler.option.warnings.allwarn"/>
- <option id="gnu.c.compiler.option.warnings.extrawarn.1591822354" superClass="gnu.c.compiler.option.warnings.extrawarn"/>
- <option id="gnu.c.compiler.option.warnings.toerrors.1554454116" superClass="gnu.c.compiler.option.warnings.toerrors"/>
- <option id="gnu.c.compiler.option.warnings.wconversion.1510160666" superClass="gnu.c.compiler.option.warnings.wconversion"/>
- <option id="gnu.c.compiler.option.warnings.wcastalign.222059275" superClass="gnu.c.compiler.option.warnings.wcastalign"/>
- <option id="gnu.c.compiler.option.warnings.wcastqual.1199025047" superClass="gnu.c.compiler.option.warnings.wcastqual"/>
- <option id="gnu.c.compiler.option.warnings.wdisabledopt.729396155" superClass="gnu.c.compiler.option.warnings.wdisabledopt"/>
- <option id="gnu.c.compiler.option.warnings.wlogicalop.358573931" superClass="gnu.c.compiler.option.warnings.wlogicalop"/>
- <option id="gnu.c.compiler.option.warnings.wmissingdecl.2015148979" superClass="gnu.c.compiler.option.warnings.wmissingdecl"/>
- <option id="gnu.c.compiler.option.warnings.wmissingincdir.1364677734" superClass="gnu.c.compiler.option.warnings.wmissingincdir"/>
- <option id="gnu.c.compiler.option.warnings.wredundantdecl.38577926" superClass="gnu.c.compiler.option.warnings.wredundantdecl"/>
- <option id="gnu.c.compiler.option.warnings.wshadow.1089454734" superClass="gnu.c.compiler.option.warnings.wshadow"/>
- <option id="gnu.c.compiler.option.warnings.wsignconv.293802508" superClass="gnu.c.compiler.option.warnings.wsignconv"/>
- <option id="gnu.c.compiler.option.warnings.wswitchdef.1180266299" superClass="gnu.c.compiler.option.warnings.wswitchdef"/>
- <option id="gnu.c.compiler.option.warnings.wundef.2012905697" superClass="gnu.c.compiler.option.warnings.wundef"/>
- <option id="gnu.c.compiler.option.warnings.wwritestrings.845766499" superClass="gnu.c.compiler.option.warnings.wwritestrings"/>
- <option id="gnu.c.compiler.option.warnings.wfloatequal.1480347443" superClass="gnu.c.compiler.option.warnings.wfloatequal"/>
- <option id="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery.561949950" superClass="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery"/>
- <option id="gnu.c.compiler.option.misc.verbose.409861784" superClass="gnu.c.compiler.option.misc.verbose"/>
- <option id="gnu.c.compiler.option.misc.ansi.651881331" superClass="gnu.c.compiler.option.misc.ansi"/>
- <option id="gnu.c.compiler.option.misc.pic.1834265980" superClass="gnu.c.compiler.option.misc.pic"/>
- <option id="gnu.c.compiler.option.misc.hardening.531686831" superClass="gnu.c.compiler.option.misc.hardening"/>
- <option id="gnu.c.compiler.option.misc.randomization.2135778774" superClass="gnu.c.compiler.option.misc.randomization"/>
- <option id="com.crt.advproject.gcc.lto.269236014" superClass="com.crt.advproject.gcc.lto"/>
- <option id="com.crt.advproject.gcc.lto.fat.609183882" superClass="com.crt.advproject.gcc.lto.fat"/>
- <option id="com.crt.advproject.gcc.merge.constants.1729173317" superClass="com.crt.advproject.gcc.merge.constants"/>
- <option id="com.crt.advproject.gcc.prefixmap.1035710819" superClass="com.crt.advproject.gcc.prefixmap"/>
- <option id="com.crt.advproject.gcc.fpu.1510415968" superClass="com.crt.advproject.gcc.fpu"/>
- <option id="com.crt.advproject.gcc.thumbinterwork.233237674" superClass="com.crt.advproject.gcc.thumbinterwork"/>
- <option id="com.crt.advproject.gcc.securestate.1997242734" superClass="com.crt.advproject.gcc.securestate"/>
- <option id="com.crt.advproject.gcc.stackusage.1349729278" superClass="com.crt.advproject.gcc.stackusage"/>
- <option id="com.crt.advproject.gcc.specs.1706288379" superClass="com.crt.advproject.gcc.specs"/>
- <option id="com.crt.advproject.gcc.config.916633443" superClass="com.crt.advproject.gcc.config"/>
- <option id="com.crt.advproject.gcc.store.208170869" superClass="com.crt.advproject.gcc.store"/>
+ <option id="com.crt.advproject.c.misc.dialect.1611109085" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true"/>
+ <option id="gnu.c.compiler.option.dialect.flags.2076081769" superClass="gnu.c.compiler.option.dialect.flags" useByScannerDiscovery="true"/>
+ <option id="gnu.c.compiler.option.preprocessor.nostdinc.759426810" superClass="gnu.c.compiler.option.preprocessor.nostdinc" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.preprocessor.preprocess.799519724" superClass="gnu.c.compiler.option.preprocessor.preprocess" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.preprocessor.undef.symbol.694234341" superClass="gnu.c.compiler.option.preprocessor.undef.symbol" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.include.paths.1977052775" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.include.files.333497305" superClass="gnu.c.compiler.option.include.files" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.optimization.flags.827202439" superClass="gnu.c.compiler.option.optimization.flags" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.exe.release.option.debugging.level.1714260887" superClass="com.crt.advproject.gcc.exe.release.option.debugging.level" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.other.350538606" superClass="gnu.c.compiler.option.debugging.other" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.prof.366903288" superClass="gnu.c.compiler.option.debugging.prof" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.gprof.1288078929" superClass="gnu.c.compiler.option.debugging.gprof" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.codecov.846798027" superClass="gnu.c.compiler.option.debugging.codecov" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitaddress.33926770" superClass="gnu.c.compiler.option.debugging.sanitaddress" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitpointers.659779568" superClass="gnu.c.compiler.option.debugging.sanitpointers" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitthread.180782359" superClass="gnu.c.compiler.option.debugging.sanitthread" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitleak.964753965" superClass="gnu.c.compiler.option.debugging.sanitleak" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.debugging.sanitundef.1704477005" superClass="gnu.c.compiler.option.debugging.sanitundef" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.syntax.1363879820" superClass="gnu.c.compiler.option.warnings.syntax" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.pedantic.885376699" superClass="gnu.c.compiler.option.warnings.pedantic" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.pedantic.error.1954188926" superClass="gnu.c.compiler.option.warnings.pedantic.error" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.nowarn.710816613" superClass="gnu.c.compiler.option.warnings.nowarn" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.allwarn.75157801" superClass="gnu.c.compiler.option.warnings.allwarn" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.extrawarn.1591822354" superClass="gnu.c.compiler.option.warnings.extrawarn" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.toerrors.1554454116" superClass="gnu.c.compiler.option.warnings.toerrors" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wconversion.1510160666" superClass="gnu.c.compiler.option.warnings.wconversion" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wcastalign.222059275" superClass="gnu.c.compiler.option.warnings.wcastalign" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wcastqual.1199025047" superClass="gnu.c.compiler.option.warnings.wcastqual" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wdisabledopt.729396155" superClass="gnu.c.compiler.option.warnings.wdisabledopt" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wlogicalop.358573931" superClass="gnu.c.compiler.option.warnings.wlogicalop" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wmissingdecl.2015148979" superClass="gnu.c.compiler.option.warnings.wmissingdecl" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wmissingincdir.1364677734" superClass="gnu.c.compiler.option.warnings.wmissingincdir" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wredundantdecl.38577926" superClass="gnu.c.compiler.option.warnings.wredundantdecl" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wshadow.1089454734" superClass="gnu.c.compiler.option.warnings.wshadow" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wsignconv.293802508" superClass="gnu.c.compiler.option.warnings.wsignconv" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wswitchdef.1180266299" superClass="gnu.c.compiler.option.warnings.wswitchdef" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wundef.2012905697" superClass="gnu.c.compiler.option.warnings.wundef" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wwritestrings.845766499" superClass="gnu.c.compiler.option.warnings.wwritestrings" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.warnings.wfloatequal.1480347443" superClass="gnu.c.compiler.option.warnings.wfloatequal" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery.561949950" superClass="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.verbose.409861784" superClass="gnu.c.compiler.option.misc.verbose" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.ansi.651881331" superClass="gnu.c.compiler.option.misc.ansi" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.pic.1834265980" superClass="gnu.c.compiler.option.misc.pic" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.hardening.531686831" superClass="gnu.c.compiler.option.misc.hardening" useByScannerDiscovery="false"/>
+ <option id="gnu.c.compiler.option.misc.randomization.2135778774" superClass="gnu.c.compiler.option.misc.randomization" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.lto.269236014" superClass="com.crt.advproject.gcc.lto" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.lto.fat.609183882" superClass="com.crt.advproject.gcc.lto.fat" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.merge.constants.1729173317" superClass="com.crt.advproject.gcc.merge.constants" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.prefixmap.1035710819" superClass="com.crt.advproject.gcc.prefixmap" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.fpu.1510415968" superClass="com.crt.advproject.gcc.fpu" useByScannerDiscovery="true"/>
+ <option id="com.crt.advproject.gcc.thumbinterwork.233237674" superClass="com.crt.advproject.gcc.thumbinterwork" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.securestate.1997242734" superClass="com.crt.advproject.gcc.securestate" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.stackusage.1349729278" superClass="com.crt.advproject.gcc.stackusage" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.specs.1706288379" superClass="com.crt.advproject.gcc.specs" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.config.916633443" superClass="com.crt.advproject.gcc.config" useByScannerDiscovery="false"/>
+ <option id="com.crt.advproject.gcc.store.208170869" superClass="com.crt.advproject.gcc.store" useByScannerDiscovery="false"/>
<inputType id="com.crt.advproject.compiler.input.784714879" superClass="com.crt.advproject.compiler.input"/>
</tool>
<tool id="com.crt.advproject.gas.exe.release.1523608774" name="MCU Assembler" superClass="com.crt.advproject.gas.exe.release">
@@ -306,7 +306,7 @@
<tool id="com.crt.advproject.link.exe.release.1012924607" name="MCU Linker" superClass="com.crt.advproject.link.exe.release">
<option id="com.crt.advproject.link.arch.287050390" name="Architecture" superClass="com.crt.advproject.link.arch" value="com.crt.advproject.link.target.cm3" valueType="enumerated"/>
<option id="com.crt.advproject.link.thumb.1115921405" name="Thumb mode" superClass="com.crt.advproject.link.thumb" value="true" valueType="boolean"/>
- <option id="com.crt.advproject.link.script.754134938" name="Linker script" superClass="com.crt.advproject.link.script" value=""2-2_asm_Release.ld"" valueType="string"/>
+ <option id="com.crt.advproject.link.script.754134938" name="Linker script" superClass="com.crt.advproject.link.script" value="2-2_asm_Release.ld" valueType="string"/>
<option id="com.crt.advproject.link.manage.1283042874" name="Manage linker script" superClass="com.crt.advproject.link.manage" value="true" valueType="boolean"/>
<option id="gnu.c.link.option.nostdlibs.2116952709" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" value="true" valueType="boolean"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.link.option.other.2082339787" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" valueType="stringList">
@@ -387,32 +387,32 @@
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="com.crt.config">
- <projectStorage><?xml version="1.0" encoding="UTF-8"?>
-<TargetConfig>
-<Properties property_2="LPC175x_6x_512.cfx" property_3="NXP" property_4="LPC1769" property_count="5" version="100300"/>
-<infoList vendor="NXP">
-<info chip="LPC1769" flash_driver="LPC175x_6x_512.cfx" match_id="0x26113F37" name="LPC1769" package="lpc17_lqfp100.xml" stub="crt_emu_cm3_nxp">
-<chip>
-<name>LPC1769</name>
-<family>LPC17xx</family>
-<vendor>NXP (formerly Philips)</vendor>
-<reset board="None" core="Real" sys="Real"/>
-<clock changeable="TRUE" freq="20MHz" is_accurate="TRUE"/>
-<memory can_program="true" id="Flash" is_ro="true" type="Flash"/>
-<memory id="RAM" type="RAM"/>
-<memory id="Periph" is_volatile="true" type="Peripheral"/>
-<memoryInstance derived_from="Flash" id="MFlash512" location="0x00000000" size="0x80000"/>
-<memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/>
-<memoryInstance derived_from="RAM" id="RamAHB32" location="0x2007c000" size="0x8000"/>
-<prog_flash blocksz="0x1000" location="0" maxprgbuff="0x1000" progwithcode="TRUE" size="0x10000"/>
-<prog_flash blocksz="0x8000" location="0x10000" maxprgbuff="0x1000" progwithcode="TRUE" size="0x70000"/>
-</chip>
-<processor>
-<name gcc_name="cortex-m3">Cortex-M3</name>
-<family>Cortex-M</family>
-</processor>
-</info>
-</infoList>
+ <projectStorage><?xml version="1.0" encoding="UTF-8"?>
+<TargetConfig>
+<Properties property_2="LPC175x_6x_512.cfx" property_3="NXP" property_4="LPC1769" property_count="5" version="100300"/>
+<infoList vendor="NXP">
+<info chip="LPC1769" flash_driver="LPC175x_6x_512.cfx" match_id="0x26113F37" name="LPC1769" package="lpc17_lqfp100.xml" stub="crt_emu_cm3_nxp">
+<chip>
+<name>LPC1769</name>
+<family>LPC17xx</family>
+<vendor>NXP (formerly Philips)</vendor>
+<reset board="None" core="Real" sys="Real"/>
+<clock changeable="TRUE" freq="20MHz" is_accurate="TRUE"/>
+<memory can_program="true" id="Flash" is_ro="true" type="Flash"/>
+<memory id="RAM" type="RAM"/>
+<memory id="Periph" is_volatile="true" type="Peripheral"/>
+<memoryInstance derived_from="Flash" id="MFlash512" location="0x00000000" size="0x80000"/>
+<memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/>
+<memoryInstance derived_from="RAM" id="RamAHB32" location="0x2007c000" size="0x8000"/>
+<prog_flash blocksz="0x1000" location="0" maxprgbuff="0x1000" progwithcode="TRUE" size="0x10000"/>
+<prog_flash blocksz="0x8000" location="0x10000" maxprgbuff="0x1000" progwithcode="TRUE" size="0x70000"/>
+</chip>
+<processor>
+<name gcc_name="cortex-m3">Cortex-M3</name>
+<family>Cortex-M</family>
+</processor>
+</info>
+</infoList>
</TargetConfig></projectStorage>
</storageModule>
<storageModule moduleId="refreshScope"/>
diff --git a/2-2_asm/src/assembleur.s b/2-2_asm/src/assembleur.s
index 8bc49ae98b7f4eba3b88d673ef3b6a212b69b2fc..47d9aeb6411708b23f8828b4b7b970bd2b6dde3d 100644
--- a/2-2_asm/src/assembleur.s
+++ b/2-2_asm/src/assembleur.s
@@ -41,10 +41,30 @@ add_err:
*****************************************************/
.thumb_func
funcexo2:
+ // r3 index for loop
+ mov r3, #0
+ cmp r3, r2
+ blt funcexo2_for_loop
+ mov r0, #1
+ bx lr
+funcexo2_for_loop:
+ add r3, #1
+ ldr r4, [r0], #4
+ adds r5, r4, r4
+ bhs err
+ str r1, [r5], #4
+ cmp r3, r2
+ blt funcexo2_for_loop
+
+err:
+ mov r0, #0
bx lr
+
+
+
.thumb_func
majuscule:
diff --git a/2-2_asm/src/labo2.2_asm.c b/2-2_asm/src/labo2.2_asm.c
index 7ac70b76fd2406e5446233120d92b1c031e3d034..e3995ebc800d5bf8040370c4515bb73966f8fcd9 100644
--- a/2-2_asm/src/labo2.2_asm.c
+++ b/2-2_asm/src/labo2.2_asm.c
@@ -25,7 +25,7 @@ uint32_t funcexo2(uint32_t *, uint32_t *, uint32_t);
void majuscule(char *s);
/* global variables */
-int exo = 1; // change this number with the exercise number you want to test;
+int exo = 2; // change this number with the exercise number you want to test;
int main(void)
{